xY6wASt=YRv$ebEfB(=AGJY*}N-*6{=tI3S?GbI?6c`N
zSkNvakhSQOb|3URo(!)rfCHzUqVpp!Fv6N*Zy%ZY}iclU&_=BRRsR}i5mKH-
zE-KX_qZkz*Vjsd;N?Q=B5>&n%ld%dOK|M*h53><65tQAN@E7eX3r
zBxEG+@?hWtR9vSXczz-1_tc3>@QkDEKA{)k2b1OWrtTc#<*^Q-3uS|C`yS+%wec3X
zma>wJ5ljAK()+PHmL>1+l6Y*Pw1B44S)^iTG+wy#vXtLdZX;QQiA(Z@D
z*o5#q^>f&^yUC9y{6RW|vXmzed0F)PR338P5=PpR<`it8@|T#4S*AQAh%6=Sr);_H
zyb^Uje!d{xnDEYKdJ<1Z-36p;*}5&UvhtPIrAT>xCZise_4ko!YDBt;9VlFtc{W=w
z<5#3-62h5efSu?Q@}r3-)9w?>7GM~@B3z{`!q!_sz87iz|3{r{WOgC3p7<3^dG^`(
z&vp{!sW&yH5N{AhQ&x%a$kr)Lo6m_Kvu*R!rU2ovO{;kY8?XKG`Jbbpxk`CX5+2wN
z`%t+a>BFSks?a{Z9p%bov-a6sy>@|8_L|z
z^yI2RuAcK)~^T!NQdAv@}3i~O#B}4B?LVsNhgrM
z2j>yKBj`!TSbNCdMfya_oVg!>e>#~p+}iC?E|JfSJ+-UK~I
z49?eBki5lMhY&gbMcf`cq%gGPYf5630pF=}-8T{BpJr<$X%rHIP3(A(SR0ka<)kJcFnlMP5$g
zdkJNUUm!1u_%Pf+_>Pc)LDEvDr#k8Ogl#t6iFiZuKfz$?&9V7INb8xe|0Y0BoXz-&
z3QdTwbmuZd;;RTXNe`hciExatnsi?rPq<3_KSH$aqdW201U+$tq135}(%?R9&GjI%gRsWrJH@Hciufe*Dr-OOlY@9+o6d|UDKAB+PJDx{Q{0w!CcTxgn(|Aw
z>_=-UJAsl)YyHp3$c(MAf-U^fsyaS|Y&KmN^V#@$I=@fZeA3Nu4E{%6AaOmj4DLU7
zQ&yX@dIUY?4DNr9aFR*nra~>kVuGIhwqh&1XXCxF4PhsBDsRqPvyS)l-1WmY->bj2
zQKOjfVx`K(lqeL<<6FP|fPqEg`?v2ipjZ2WefyUSub$ASWBWegP5bul-MRmu?!9_-
w4zJM3ofkFWfAcDL?cKh6uc(fFdso_gc>azw(?={XHvQ+*88#nW@nq=#0Oi28=Kufz
diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
index 2008a9abd..48df8c9db 100644
--- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
@@ -11,8 +11,8 @@ msgstr ""
"Project-Id-Version: Airtime\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-12-13 12:58-0500\n"
-"PO-Revision-Date: 2014-11-04 16:43+0000\n"
-"Last-Translator: Duncan Sommerville \n"
+"PO-Revision-Date: 2014-11-05 10:53+0000\n"
+"Last-Translator: Andrey Podshivalov\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/airtime/language/ja/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -2063,14 +2063,14 @@ msgid ""
"A static smart block will save the criteria and generate the block content "
"immediately. This allows you to edit and view it in the Library before "
"adding it to a show."
-msgstr ""
+msgstr "スマート・ブロックは基準を満たし、即時にブロック・コンテンツを生成します。これにより、コンテンツをショーに追加する前にライブラリーにおいてコンテンツを編集および閲覧できます。"
#: airtime_mvc/application/controllers/LocaleController.php:134
msgid ""
"A dynamic smart block will only save the criteria. The block content will "
"get generated upon adding it to a show. You will not be able to view and "
"edit the content in the Library."
-msgstr ""
+msgstr "自動生成スマートブロックは基準の設定のみ操作できます。ブロックコンテンツは番組に追加するとすぐに生成されます。生成したコンテンツをライブラリ内で編集することはできません。"
#: airtime_mvc/application/controllers/LocaleController.php:136
msgid ""
From 00e85de3c8818c2cb9e486430b8c82326fc140ae Mon Sep 17 00:00:00 2001
From: Duncan Sommerville
Date: Tue, 28 Oct 2014 17:18:11 -0400
Subject: [PATCH 05/21] Updated preEditShowValidationCheck to behave properly
when dealing with shows with cc_show_days rows in the past, updated
serialized form data in add-show to accommodate the change
---
.../application/services/ShowFormService.php | 19 +-
.../public/js/airtime/schedule/add-show.js | 304 +++++++++---------
2 files changed, 164 insertions(+), 159 deletions(-)
diff --git a/airtime_mvc/application/services/ShowFormService.php b/airtime_mvc/application/services/ShowFormService.php
index 74124421f..94cc0068a 100644
--- a/airtime_mvc/application/services/ShowFormService.php
+++ b/airtime_mvc/application/services/ShowFormService.php
@@ -362,33 +362,22 @@ class Application_Service_ShowFormService
}
/**
- *
* Before we send the form data in for validation, there
* are a few fields we may need to adjust first
+ *
* @param $formData
*/
public function preEditShowValidationCheck($formData)
{
- $validateStartDate = true;
- $validateStartTime = true;
+ // If the start date or time were disabled, don't validate them
+ $validateStartDate = $formData['start_date_disabled'] === "false";
+ $validateStartTime = $formData['start_time_disabled'] === "false";
//CcShowDays object of the show currently being edited
$currentShowDay = $this->ccShow->getFirstCcShowDay();
//DateTime object
$dt = $currentShowDay->getLocalStartDateAndTime();
-
- if (!array_key_exists('add_show_start_date', $formData)) {
- //Changing the start date was disabled, since the
- //array key does not exist. We need to repopulate this entry from the db.
- $formData['add_show_start_date'] = $dt->format("Y-m-d");
-
- if (!array_key_exists('add_show_start_time', $formData)) {
- $formData['add_show_start_time'] = $dt->format("H:i");
- $validateStartTime = false;
- }
- $validateStartDate = false;
- }
$formData['add_show_record'] = $currentShowDay->getDbRecord();
//if the show is repeating, set the start date to the next
diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js
index 0d22188c4..c452c2520 100644
--- a/airtime_mvc/public/js/airtime/schedule/add-show.js
+++ b/airtime_mvc/public/js/airtime/schedule/add-show.js
@@ -1,6 +1,6 @@
/**
*
-* Schedule Dialog creation methods.
+* Schedule Dialog creation methods.
*
*/
@@ -53,14 +53,14 @@ function removeAddShowButton(){
//$el is DOM element #add-show-form
//form is the new form contents to append to $el
function redrawAddShowForm($el, form) {
-
- //need to clean up the color picker.
+
+ //need to clean up the color picker.
$el.find("#schedule-show-style input").each(function(i, el){
- var $input = $(this),
- colId = $input.data("colorpickerId");
-
- $("#"+colId).remove();
- $input.removeData();
+ var $input = $(this),
+ colId = $input.data("colorpickerId");
+
+ $("#"+colId).remove();
+ $input.removeData();
});
$el.empty().append(form);
@@ -74,12 +74,12 @@ function closeAddShowForm(event) {
var $el = $("#add-show-form");
- $el.hide();
+ $el.hide();
windowResize();
$.get(baseUrl+"Schedule/get-form", {format:"json"}, function(json) {
-
- redrawAddShowForm($el, json.form);
+
+ redrawAddShowForm($el, json.form);
});
makeAddShowButton();
@@ -87,29 +87,29 @@ function closeAddShowForm(event) {
//dateText mm-dd-yy
function startDpSelect(dateText, inst) {
- var time, date;
+ var time, date;
- time = dateText.split("-");
- date = new Date(time[0], time[1] - 1, time[2]);
+ time = dateText.split("-");
+ date = new Date(time[0], time[1] - 1, time[2]);
if (inst.input)
inst.input.trigger('input');
}
function endDpSelect(dateText, inst) {
- var time, date;
+ var time, date;
- time = dateText.split("-");
- date = new Date(time[0], time[1] - 1, time[2]);
+ time = dateText.split("-");
+ date = new Date(time[0], time[1] - 1, time[2]);
- if (inst.input)
+ if (inst.input)
inst.input.trigger('input');
}
function createDateInput(el, onSelect) {
- var date;
+ var date;
- el.datepicker({
+ el.datepicker({
minDate: adjustDateToServerDate(new Date(), timezoneOffset),
onSelect: onSelect,
dateFormat: 'yy-mm-dd',
@@ -119,42 +119,42 @@ function createDateInput(el, onSelect) {
closeText: $.i18n._('Close'),
//showButtonPanel: true,
firstDay: calendarPref.weekStart
- });
+ });
}
function autoSelect(event, ui) {
$("#add_show_hosts-"+ui.item.index).attr("checked", "checked");
- event.preventDefault();
+ event.preventDefault();
}
function findHosts(request, callback) {
- var search, url;
+ var search, url;
- url = baseUrl+"User/get-hosts";
- search = request.term;
+ url = baseUrl+"User/get-hosts";
+ search = request.term;
- var noResult = new Array();
+ var noResult = new Array();
noResult[0] = new Array();
noResult[0]['value'] = $("#add_show_hosts_autocomplete").val();
noResult[0]['label'] = $.i18n._("No result found");
noResult[0]['index'] = null;
- $.post(url,
- {format: "json", term: search},
+ $.post(url,
+ {format: "json", term: search},
- function(json) {
- if(json.hosts.length<1){
- callback(noResult);
- }else{
- callback(json.hosts);
- }
- });
+ function(json) {
+ if(json.hosts.length<1){
+ callback(noResult);
+ }else{
+ callback(json.hosts);
+ }
+ });
}
function beginEditShow(data){
-
+
if (data.show_error == true){
alertShowErrorAndReload();
return false;
@@ -201,11 +201,11 @@ function stringToColor(s)
}
function getContrastYIQ(hexcolor){
- var r = parseInt(hexcolor.substr(0,2),16);
- var g = parseInt(hexcolor.substr(2,2),16);
- var b = parseInt(hexcolor.substr(4,2),16);
- var yiq = ((r*299)+(g*587)+(b*114))/1000;
- return (yiq >= 128) ? '000000' : 'ffffff';
+ var r = parseInt(hexcolor.substr(0,2),16);
+ var g = parseInt(hexcolor.substr(2,2),16);
+ var b = parseInt(hexcolor.substr(4,2),16);
+ var yiq = ((r*299)+(g*587)+(b*114))/1000;
+ return (yiq >= 128) ? '000000' : 'ffffff';
}
@@ -213,7 +213,7 @@ function setAddShowEvents(form) {
//var form = $("#add-show-form");
- form.find("h3").click(function(){
+ form.find("h3").click(function(){
$(this).next().toggle();
});
@@ -308,16 +308,16 @@ function setAddShowEvents(form) {
form.find("#add_show_rebroadcast").click(function(){
$(this).blur();
if(form.find("#add_show_record").attr('checked')){
- if($(this).attr('checked') && !form.find("#add_show_repeats").attr('checked')) {
- form.find("#add_show_rebroadcast_absolute").show();
- }
- else if($(this).attr('checked') && form.find("#add_show_repeats").attr('checked')) {
- form.find("#add_show_rebroadcast_relative").show();
- }
- else {
- form.find("#schedule-record-rebroadcast > fieldset:not(:first-child)").hide();
- }
- }
+ if($(this).attr('checked') && !form.find("#add_show_repeats").attr('checked')) {
+ form.find("#add_show_rebroadcast_absolute").show();
+ }
+ else if($(this).attr('checked') && form.find("#add_show_repeats").attr('checked')) {
+ form.find("#add_show_rebroadcast_relative").show();
+ }
+ else {
+ form.find("#schedule-record-rebroadcast > fieldset:not(:first-child)").hide();
+ }
+ }
});
// in case user is creating a new show, there will be
@@ -492,9 +492,9 @@ function setAddShowEvents(form) {
endDateVisibility();
form.find("#add_show_no_end").click(endDateVisibility);
- createDateInput(form.find("#add_show_start_date"), startDpSelect);
- createDateInput(form.find("#add_show_end_date_no_repeat"), endDpSelect);
- createDateInput(form.find("#add_show_end_date"), endDpSelect);
+ createDateInput(form.find("#add_show_start_date"), startDpSelect);
+ createDateInput(form.find("#add_show_end_date_no_repeat"), endDpSelect);
+ createDateInput(form.find("#add_show_end_date"), endDpSelect);
$("#add_show_start_time").timepicker({
amPmText: ['', ''],
@@ -519,7 +519,7 @@ function setAddShowEvents(form) {
closeText: 'Close',
showButtonPanel: true,
firstDay: calendarPref.weekStart
- });
+ });
form.find('input[name^="add_show_rebroadcast_time"]').timepicker({
amPmText: ['', ''],
defaultTime: '',
@@ -569,36 +569,36 @@ function setAddShowEvents(form) {
list.next().show();
});
- form.find("#add_show_hosts_autocomplete").autocomplete({
- source: findHosts,
- select: autoSelect,
+ form.find("#add_show_hosts_autocomplete").autocomplete({
+ source: findHosts,
+ select: autoSelect,
delay: 200
- });
-
- form.find("#add_show_hosts_autocomplete").keypress(function(e){
+ });
+
+ form.find("#add_show_hosts_autocomplete").keypress(function(e){
if( e.which == 13 ){
return false;
}
})
- form.find("#schedule-show-style input").ColorPicker({
+ form.find("#schedule-show-style input").ColorPicker({
onChange: function (hsb, hex, rgb, el) {
- $(el).val(hex);
- },
- onSubmit: function(hsb, hex, rgb, el) {
- $(el).val(hex);
- $(el).ColorPickerHide();
- },
- onBeforeShow: function () {
- $(this).ColorPickerSetColor(this.value);
- }
- });
+ $(el).val(hex);
+ },
+ onSubmit: function(hsb, hex, rgb, el) {
+ $(el).val(hex);
+ $(el).ColorPickerHide();
+ },
+ onBeforeShow: function () {
+ $(this).ColorPickerSetColor(this.value);
+ }
+ });
form.find("#add-show-close").click(closeAddShowForm);
- form.find(".add-show-submit").click(function(event) {
- event.preventDefault();
-
+ form.find(".add-show-submit").click(function(event) {
+ event.preventDefault();
+
var addShowButton = $(this);
$('#schedule-add-show').block({
@@ -612,9 +612,25 @@ function setAddShowEvents(form) {
if (form.find("#add_show_record").attr("disabled", true)) {
form.find("#add_show_record").attr("disabled", false);
}
+
+ var startDateDisabled = false,
+ startTimeDisabled = false;
+
+ // Similarly, we need to re-enable start date and time if they're disabled
+ if (form.find("#add_show_start_date").prop("disabled") === true) {
+ form.find("#add_show_start_date").attr("disabled", false);
+ startDateDisabled = true;
+ }
+ if (form.find("#add_show_start_time").prop("disabled") === true) {
+ form.find("#add_show_start_time").attr("disabled", false);
+ startTimeDisabled = true;
+ }
- var data = $("form").serializeArray();
-
+ var data = $("form").serializeArray();
+ // We need to notify the application if date and time were disabled
+ data.push({name: 'start_date_disabled', value: startDateDisabled});
+ data.push({name: 'start_time_disabled', value: startTimeDisabled});
+
var hosts = $('#add_show_hosts-element input').map(function() {
if($(this).attr("checked")) {
return $(this).val();
@@ -638,21 +654,21 @@ function setAddShowEvents(form) {
var $addShowForm = $("#add-show-form");
if (json.form) {
-
- redrawAddShowForm($addShowForm, json.form);
+
+ redrawAddShowForm($addShowForm, json.form);
$("#add_show_end_date").val(end_date);
$("#add_show_start_date").val(start_date);
showErrorSections();
}
else if (json.edit) {
-
+
$("#schedule_calendar").removeAttr("style")
- .fullCalendar('render');
+ .fullCalendar('render');
$addShowForm.hide();
$.get(baseUrl+"Schedule/get-form", {format:"json"}, function(json){
- redrawAddShowForm($addShowForm, json.form);
+ redrawAddShowForm($addShowForm, json.form);
});
makeAddShowButton();
}
@@ -662,60 +678,60 @@ function setAddShowEvents(form) {
scheduleRefetchEvents(json);
}
});
- });
+ });
var regDate = new RegExp(/^[0-9]{4}-[0-1][0-9]-[0-3][0-9]$/);
var regTime = new RegExp(/^[0-2][0-9]:[0-5][0-9]$/);
- // when start date/time changes, set end date/time to start date/time+1 hr
- $('#add_show_start_date, #add_show_start_time').bind('input', 'change', function(){
- var startDateString = $('#add_show_start_date').val();
- var startTimeString = $('#add_show_start_time').val();
-
- if(regDate.test(startDateString) && regTime.test(startTimeString)){
- var startDate = startDateString.split('-');
- var startTime = startTimeString.split(':');
+ // when start date/time changes, set end date/time to start date/time+1 hr
+ $('#add_show_start_date, #add_show_start_time').bind('input', 'change', function(){
+ var startDateString = $('#add_show_start_date').val();
+ var startTimeString = $('#add_show_start_time').val();
+
+ if(regDate.test(startDateString) && regTime.test(startTimeString)){
+ var startDate = startDateString.split('-');
+ var startTime = startTimeString.split(':');
var startDateTime = new Date(startDate[0], parseInt(startDate[1], 10)-1, startDate[2], startTime[0], startTime[1], 0, 0);
var endDateString = $('#add_show_end_date_no_repeat').val();
var endTimeString = $('#add_show_end_time').val()
- var endDate = endDateString.split('-');
- var endTime = endTimeString.split(':');
+ var endDate = endDateString.split('-');
+ var endTime = endTimeString.split(':');
var endDateTime = new Date(endDate[0], parseInt(endDate[1], 10)-1, endDate[2], endTime[0], endTime[1], 0, 0);
- if(startDateTime.getTime() >= endDateTime.getTime()){
- var duration = $('#add_show_duration').val();
- // parse duration
- var time = 0;
- var info = duration.split(' ');
- var h = parseInt(info[0], 10);
- time += h * 60 * 60* 1000;
- if(info.length >1 && $.trim(info[1]) !== ''){
- var m = parseInt(info[1], 10);
- time += m * 60 * 1000;
- }
- endDateTime = new Date(startDateTime.getTime() + time);
- }
+ if(startDateTime.getTime() >= endDateTime.getTime()){
+ var duration = $('#add_show_duration').val();
+ // parse duration
+ var time = 0;
+ var info = duration.split(' ');
+ var h = parseInt(info[0], 10);
+ time += h * 60 * 60* 1000;
+ if(info.length >1 && $.trim(info[1]) !== ''){
+ var m = parseInt(info[1], 10);
+ time += m * 60 * 1000;
+ }
+ endDateTime = new Date(startDateTime.getTime() + time);
+ }
- var endDateFormat = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2);
- var endTimeFormat = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2);
+ var endDateFormat = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2);
+ var endTimeFormat = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2);
- $('#add_show_end_date_no_repeat').val(endDateFormat);
- $('#add_show_end_time').val(endTimeFormat);
+ $('#add_show_end_date_no_repeat').val(endDateFormat);
+ $('#add_show_end_time').val(endTimeFormat);
- // calculate duration
- var startDateTimeString = startDateString + " " + startTimeString;
- var endDateTimeString = $('#add_show_end_date_no_repeat').val() + " " + $('#add_show_end_time').val();
- var timezone = $("#add_show_timezone").val();
- calculateDuration(startDateTimeString, endDateTimeString, timezone);
- }
- });
+ // calculate duration
+ var startDateTimeString = startDateString + " " + startTimeString;
+ var endDateTimeString = $('#add_show_end_date_no_repeat').val() + " " + $('#add_show_end_time').val();
+ var timezone = $("#add_show_timezone").val();
+ calculateDuration(startDateTimeString, endDateTimeString, timezone);
+ }
+ });
- // when end date/time changes, check if the changed date is in past of start date/time
- $('#add_show_end_date_no_repeat, #add_show_end_time').bind('input', 'change', function(){
- var endDateString = $('#add_show_end_date_no_repeat').val();
+ // when end date/time changes, check if the changed date is in past of start date/time
+ $('#add_show_end_date_no_repeat, #add_show_end_time').bind('input', 'change', function(){
+ var endDateString = $('#add_show_end_date_no_repeat').val();
var endTimeString = $('#add_show_end_time').val()
-
+
if(regDate.test(endDateString) && regTime.test(endTimeString)){
var startDateString = $('#add_show_start_date').val();
var startTimeString = $('#add_show_start_time').val();
@@ -727,21 +743,21 @@ function setAddShowEvents(form) {
var endTime = endTimeString.split(':');
var endDateTime = new Date(endDate[0], parseInt(endDate[1], 10)-1, endDate[2], endTime[0], endTime[1], 0, 0);
- if(startDateTime.getTime() > endDateTime.getTime()){
- $('#add_show_end_date_no_repeat').css('background-color', '#F49C9C');
- $('#add_show_end_time').css('background-color', '#F49C9C');
- }else{
- $('#add_show_end_date_no_repeat').css('background-color', '');
- $('#add_show_end_time').css('background-color', '');
- }
+ if(startDateTime.getTime() > endDateTime.getTime()){
+ $('#add_show_end_date_no_repeat').css('background-color', '#F49C9C');
+ $('#add_show_end_time').css('background-color', '#F49C9C');
+ }else{
+ $('#add_show_end_date_no_repeat').css('background-color', '');
+ $('#add_show_end_time').css('background-color', '');
+ }
- // calculate duration
- var startDateTimeString = startDateString + " " + startTimeString;
+ // calculate duration
+ var startDateTimeString = startDateString + " " + startTimeString;
var endDateTimeString = endDateString + " " + endTimeString;
var timezone = $("#add_show_timezone").val();
calculateDuration(startDateTimeString, endDateTimeString, timezone);
}
- });
+ });
if($('#cb_custom_auth').attr('checked')){
$('#custom_auth_div').show()
@@ -757,18 +773,18 @@ function setAddShowEvents(form) {
}
})
- function calculateDuration(startDateTime, endDateTime, timezone){
- var loadingIcon = $('#icon-loader-small');
-
- loadingIcon.show();
- $.post(
- baseUrl+"Schedule/calculate-duration",
- {startTime: startDateTime, endTime: endDateTime, timezone: timezone},
- function(data) {
- $('#add_show_duration').val(JSON.parse(data));
- loadingIcon.hide();
- });
- }
+ function calculateDuration(startDateTime, endDateTime, timezone){
+ var loadingIcon = $('#icon-loader-small');
+
+ loadingIcon.show();
+ $.post(
+ baseUrl+"Schedule/calculate-duration",
+ {startTime: startDateTime, endTime: endDateTime, timezone: timezone},
+ function(data) {
+ $('#add_show_duration').val(JSON.parse(data));
+ loadingIcon.hide();
+ });
+ }
var bgColorEle = $("#add_show_background_color");
var textColorEle = $("#add_show_color");
From 79548c9e834c36b1a2e28cdb2779d840ea565e65 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville
Date: Wed, 5 Nov 2014 14:35:19 -0500
Subject: [PATCH 06/21] Changed tabs to spaces and moved apache2 version call
to after installation
---
install_full/ubuntu/airtime-full-install | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install
index 5b0522f73..5bd4a6485 100755
--- a/install_full/ubuntu/airtime-full-install
+++ b/install_full/ubuntu/airtime-full-install
@@ -29,10 +29,6 @@ echo "----------------------------------------------------"
dist=`lsb_release -is`
code=`lsb_release -cs`
-set +e
-apache2 -v | grep "2\.4" > /dev/null
-apacheversion=$?
-set -e
#enable squeeze backports to get lame packages
if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then
@@ -130,21 +126,27 @@ if [ "$server" = "nginx" ]; then
fi
else
apt-get -y --force-yes install apache2 libapache2-mod-php5
+ set +e
+ apache2 -v | grep "2\.4" > /dev/null
+ apacheversion=$?
+ set -e
+
+
# Apache Config File
echo "----------------------------------------------------"
echo "2.1 Apache Config File"
echo "----------------------------------------------------"
if [ "$apacheversion" != "1" ]; then
- airtimeconfigfile="airtime.conf"
+ airtimeconfigfile="airtime.conf"
else
- airtimeconfigfile="airtime"
+ airtimeconfigfile="airtime"
fi
if [ ! -f /etc/apache2/sites-available/$airtimeconfigfile ]; then
echo "Creating Apache config for Airtime..."
- cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/$airtimeconfigfile
+ cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/$airtimeconfigfile
a2dissite 000-default
a2ensite airtime
else
From 273afaa126aabb80e6907cc442579b4dad98a0e7 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville
Date: Wed, 5 Nov 2014 16:47:09 -0500
Subject: [PATCH 07/21] Added Japanese language text files to js i18n
datatables
---
airtime_mvc/public/js/datatables/i18n/ja.txt | 17 +++++++++++++++++
airtime_mvc/public/js/datatables/i18n/ja_JP.txt | 17 +++++++++++++++++
2 files changed, 34 insertions(+)
create mode 100644 airtime_mvc/public/js/datatables/i18n/ja.txt
create mode 100644 airtime_mvc/public/js/datatables/i18n/ja_JP.txt
diff --git a/airtime_mvc/public/js/datatables/i18n/ja.txt b/airtime_mvc/public/js/datatables/i18n/ja.txt
new file mode 100644
index 000000000..54a83283a
--- /dev/null
+++ b/airtime_mvc/public/js/datatables/i18n/ja.txt
@@ -0,0 +1,17 @@
+{
+ "sProcessing": "処理中...",
+ "sLengthMenu": "_MENU_ 件表示",
+ "sZeroRecords": "データはありません。",
+ "sInfo": " _TOTAL_ 件中 _START_ から _END_ まで表示",
+ "sInfoEmpty": " 0 件中 0 から 0 まで表示",
+ "sInfoFiltered": "(全 _MAX_ 件より抽出)",
+ "sInfoPostFix": "",
+ "sSearch": "検索:",
+ "sUrl": "",
+ "oPaginate": {
+ "sFirst": "先頭",
+ "sPrevious": "前",
+ "sNext": "次",
+ "sLast": "最終"
+ }
+}
diff --git a/airtime_mvc/public/js/datatables/i18n/ja_JP.txt b/airtime_mvc/public/js/datatables/i18n/ja_JP.txt
new file mode 100644
index 000000000..54a83283a
--- /dev/null
+++ b/airtime_mvc/public/js/datatables/i18n/ja_JP.txt
@@ -0,0 +1,17 @@
+{
+ "sProcessing": "処理中...",
+ "sLengthMenu": "_MENU_ 件表示",
+ "sZeroRecords": "データはありません。",
+ "sInfo": " _TOTAL_ 件中 _START_ から _END_ まで表示",
+ "sInfoEmpty": " 0 件中 0 から 0 まで表示",
+ "sInfoFiltered": "(全 _MAX_ 件より抽出)",
+ "sInfoPostFix": "",
+ "sSearch": "検索:",
+ "sUrl": "",
+ "oPaginate": {
+ "sFirst": "先頭",
+ "sPrevious": "前",
+ "sNext": "次",
+ "sLast": "最終"
+ }
+}
From 90626a2fcbcb91672560bdc6bedd95f9eab701e0 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville
Date: Wed, 5 Nov 2014 17:04:18 -0500
Subject: [PATCH 08/21] Formatting; Changed tabs to spaces
---
.../controllers/LocaleController.php | 2 +-
airtime_mvc/application/models/Preference.php | 177 ++++++++----------
2 files changed, 81 insertions(+), 98 deletions(-)
diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php
index 3eb346d0b..372967bbb 100644
--- a/airtime_mvc/application/controllers/LocaleController.php
+++ b/airtime_mvc/application/controllers/LocaleController.php
@@ -5,7 +5,7 @@ class LocaleController extends Zend_Controller_Action
public function init()
{
}
-
+
public function datatablesTranslationTableAction()
{
$this->view->layout()->disableLayout();
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index e73069f43..848792318 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -4,45 +4,44 @@ require_once 'Cache.php';
class Application_Model_Preference
{
-
- private static function getUserId()
- {
- //pass in true so the check is made with the autoloader
- //we need this check because saas calls this function from outside Zend
- if (!class_exists("Zend_Auth", true) || !Zend_Auth::getInstance()->hasIdentity()) {
- $userId = null;
- }
- else {
- $auth = Zend_Auth::getInstance();
- $userId = $auth->getIdentity()->id;
- }
-
- return $userId;
- }
-
+
+ private static function getUserId()
+ {
+ //pass in true so the check is made with the autoloader
+ //we need this check because saas calls this function from outside Zend
+ if (!class_exists("Zend_Auth", true) || !Zend_Auth::getInstance()->hasIdentity()) {
+ $userId = null;
+ } else {
+ $auth = Zend_Auth::getInstance();
+ $userId = $auth->getIdentity()->id;
+ }
+
+ return $userId;
+ }
+
/**
*
* @param boolean $isUserValue is true when we are setting a value for the current user
*/
private static function setValue($key, $value, $isUserValue = false)
{
- $cache = new Cache();
-
+ $cache = new Cache();
+
try {
+
$con = Propel::getConnection(CcPrefPeer::DATABASE_NAME);
$con->beginTransaction();
$userId = self::getUserId();
- if ($isUserValue && is_null($userId)) {
- throw new Exception("User id can't be null for a user preference {$key}.");
- }
+ if ($isUserValue && is_null($userId))
+ throw new Exception("User id can't be null for a user preference {$key}.");
Application_Common_Database::prepareAndExecute("LOCK TABLE cc_pref");
//Check if key already exists
$sql = "SELECT COUNT(*) FROM cc_pref"
- ." WHERE keystr = :key";
+ ." WHERE keystr = :key";
$paramMap = array();
$paramMap[':key'] = $key;
@@ -64,37 +63,33 @@ class Application_Model_Preference
//this case should not happen.
throw new Exception("Invalid number of results returned. Should be ".
"0 or 1, but is '$result' instead");
- }
- elseif ($result == 1) {
-
+ } else if ($result == 1) {
+
// result found
if (!$isUserValue) {
// system pref
$sql = "UPDATE cc_pref"
- ." SET subjid = NULL, valstr = :value"
- ." WHERE keystr = :key";
- }
- else {
+ ." SET subjid = NULL, valstr = :value"
+ ." WHERE keystr = :key";
+ } else {
// user pref
$sql = "UPDATE cc_pref"
- . " SET valstr = :value"
- . " WHERE keystr = :key AND subjid = :id";
+ . " SET valstr = :value"
+ . " WHERE keystr = :key AND subjid = :id";
$paramMap[':id'] = $userId;
}
- }
- else {
-
+ } else {
+
// result not found
if (!$isUserValue) {
// system pref
$sql = "INSERT INTO cc_pref (keystr, valstr)"
- ." VALUES (:key, :value)";
- }
- else {
+ ." VALUES (:key, :value)";
+ } else {
// user pref
$sql = "INSERT INTO cc_pref (subjid, keystr, valstr)"
- ." VALUES (:id, :key, :value)";
+ ." VALUES (:id, :key, :value)";
$paramMap[':id'] = $userId;
}
@@ -109,8 +104,7 @@ class Application_Model_Preference
$con);
$con->commit();
- }
- catch (Exception $e) {
+ } catch (Exception $e) {
$con->rollback();
header('HTTP/1.0 503 Service Unavailable');
Logging::info("Database error: ".$e->getMessage());
@@ -118,26 +112,22 @@ class Application_Model_Preference
}
$cache->store($key, $value, $isUserValue, $userId);
- //Logging::info("SAVING {$key} {$userId} into cache. = {$value}");
}
private static function getValue($key, $isUserValue = false)
{
- $cache = new Cache();
-
+ $cache = new Cache();
+
try {
-
- $userId = self::getUserId();
-
- if ($isUserValue && is_null($userId)) {
- throw new Exception("User id can't be null for a user preference.");
- }
+
+ $userId = self::getUserId();
+
+ if ($isUserValue && is_null($userId))
+ throw new Exception("User id can't be null for a user preference.");
- $res = $cache->fetch($key, $isUserValue, $userId);
- if ($res !== false) {
- //Logging::info("returning {$key} {$userId} from cache. = {$res}");
- return $res;
- }
+ // If the value is already cached, return it
+ $res = $cache->fetch($key, $isUserValue, $userId);
+ if ($res !== false) return $res;
//Check if key already exists
$sql = "SELECT COUNT(*) FROM cc_pref"
@@ -147,7 +137,7 @@ class Application_Model_Preference
$paramMap[':key'] = $key;
//For user specific preference, check if id matches as well
- if ($isUserValue) {
+ if ($isUserValue) {
$sql .= " AND subjid = :id";
$paramMap[':id'] = $userId;
}
@@ -157,8 +147,7 @@ class Application_Model_Preference
//return an empty string if the result doesn't exist.
if ($result == 0) {
$res = "";
- }
- else {
+ } else {
$sql = "SELECT valstr FROM cc_pref"
." WHERE keystr = :key";
@@ -248,53 +237,53 @@ class Application_Model_Preference
public static function SetDefaultCrossfadeDuration($duration)
{
- self::setValue("default_crossfade_duration", $duration);
+ self::setValue("default_crossfade_duration", $duration);
}
public static function GetDefaultCrossfadeDuration()
{
- $duration = self::getValue("default_crossfade_duration");
+ $duration = self::getValue("default_crossfade_duration");
- if ($duration === "") {
- // the default value of the fade is 00.5
- return "0";
- }
+ if ($duration === "") {
+ // the default value of the fade is 00.5
+ return "0";
+ }
- return $duration;
+ return $duration;
}
public static function SetDefaultFadeIn($fade)
{
- self::setValue("default_fade_in", $fade);
+ self::setValue("default_fade_in", $fade);
}
public static function GetDefaultFadeIn()
{
- $fade = self::getValue("default_fade_in");
+ $fade = self::getValue("default_fade_in");
- if ($fade === "") {
- // the default value of the fade is 00.5
- return "00.5";
- }
+ if ($fade === "") {
+ // the default value of the fade is 00.5
+ return "00.5";
+ }
- return $fade;
+ return $fade;
}
public static function SetDefaultFadeOut($fade)
{
- self::setValue("default_fade_out", $fade);
+ self::setValue("default_fade_out", $fade);
}
public static function GetDefaultFadeOut()
{
- $fade = self::getValue("default_fade_out");
+ $fade = self::getValue("default_fade_out");
- if ($fade === "") {
- // the default value of the fade is 00.5
- return "00.5";
- }
+ if ($fade === "") {
+ // the default value of the fade is 00.5
+ return "00.5";
+ }
- return $fade;
+ return $fade;
}
public static function SetDefaultFade($fade)
@@ -556,9 +545,8 @@ class Application_Model_Preference
{
// When a new user is created they will get the default timezone
// setting which the admin sets on preferences page
- if (is_null($timezone)) {
+ if (is_null($timezone))
$timezone = self::GetDefaultTimezone();
- }
self::setValue("user_timezone", $timezone, true);
}
@@ -567,8 +555,7 @@ class Application_Model_Preference
$timezone = self::getValue("user_timezone", true);
if (!$timezone) {
return self::GetDefaultTimezone();
- }
- else {
+ } else {
return $timezone;
}
}
@@ -580,8 +567,7 @@ class Application_Model_Preference
if (!is_null($userId)) {
return self::GetUserTimezone();
- }
- else {
+ } else {
return self::GetDefaultTimezone();
}
}
@@ -612,9 +598,8 @@ class Application_Model_Preference
{
// When a new user is created they will get the default locale
// setting which the admin sets on preferences page
- if (is_null($locale)) {
+ if (is_null($locale))
$locale = self::GetDefaultLocale();
- }
self::setValue("user_locale", $locale, true);
}
@@ -624,8 +609,7 @@ class Application_Model_Preference
if (!is_null($userId)) {
return self::GetUserLocale();
- }
- else {
+ } else {
return self::GetDefaultLocale();
}
}
@@ -648,7 +632,7 @@ class Application_Model_Preference
public static function SetUniqueId($id)
{
- self::setValue("uniqueId", $id);
+ self::setValue("uniqueId", $id);
}
public static function GetUniqueId()
@@ -908,7 +892,7 @@ class Application_Model_Preference
public static function SetAirtimeVersion($version)
{
- self::setValue("system_version", $version);
+ self::setValue("system_version", $version);
}
public static function GetAirtimeVersion()
@@ -1404,12 +1388,11 @@ class Application_Model_Preference
return self::getValue("enable_replay_gain", false);
}
- public static function getReplayGainModifier(){
+ public static function getReplayGainModifier() {
$rg_modifier = self::getValue("replay_gain_modifier");
- if ($rg_modifier === "") {
+ if ($rg_modifier === "")
return "0";
- }
return $rg_modifier;
}
@@ -1420,18 +1403,18 @@ class Application_Model_Preference
}
public static function SetHistoryItemTemplate($value) {
- self::setValue("history_item_template", $value);
+ self::setValue("history_item_template", $value);
}
public static function GetHistoryItemTemplate() {
- return self::getValue("history_item_template");
+ return self::getValue("history_item_template");
}
public static function SetHistoryFileTemplate($value) {
- self::setValue("history_file_template", $value);
+ self::setValue("history_file_template", $value);
}
public static function GetHistoryFileTemplate() {
- return self::getValue("history_file_template");
+ return self::getValue("history_file_template");
}
}
From 564e8d931107047883d21819a3d1b93380e10169 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville
Date: Wed, 5 Nov 2014 17:21:19 -0500
Subject: [PATCH 09/21] Replaced hardcoded locale defaults with the station
default locale
---
.../controllers/LoginController.php | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php
index 5e9b70e31..c808c2aee 100644
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@@ -12,12 +12,12 @@ class LoginController extends Zend_Controller_Action
$CC_CONFIG = Config::getConfig();
$request = $this->getRequest();
+ $stationLocale = Application_Model_Preference::GetDefaultLocale();
- Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA'));
+ Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale));
$auth = Zend_Auth::getInstance();
- if ($auth->hasIdentity())
- {
+ if ($auth->hasIdentity()) {
$this->_redirect('Showbuilder');
}
@@ -110,7 +110,9 @@ class LoginController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'js/airtime/login/password-restore.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$request = $this->getRequest();
- Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA'));
+ $stationLocale = Application_Model_Preference::GetDefaultLocale();
+
+ Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale));
if (!Application_Model_Preference::GetEnableSystemEmail()) {
$this->_redirect('login');
@@ -154,7 +156,9 @@ class LoginController extends Zend_Controller_Action
public function passwordRestoreAfterAction()
{
$request = $this->getRequest();
- Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA'));
+ $stationLocale = Application_Model_Preference::GetDefaultLocale();
+
+ Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale));
//uses separate layout without a navigation.
$this->_helper->layout->setLayout('login');
@@ -172,8 +176,10 @@ class LoginController extends Zend_Controller_Action
$form = new Application_Form_PasswordChange();
$auth = new Application_Model_Auth();
$user = CcSubjsQuery::create()->findPK($user_id);
+
+ $stationLocale = Application_Model_Preference::GetDefaultLocale();
- Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA'));
+ Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale));
//check validity of token
if (!$auth->checkToken($user_id, $token, 'password.restore')) {
From b94d34f719ce16682b31b81790b11659cd60ac35 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville
Date: Wed, 5 Nov 2014 17:22:13 -0500
Subject: [PATCH 10/21] Removed calls to set user locale and timezone on user
creation; these calls were updating the current user instead of the created
user, and so served no purpose
---
airtime_mvc/application/controllers/UserController.php | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index fad0277db..c75e2b49e 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -69,12 +69,6 @@ class UserController extends Zend_Controller_Action
$user->setJabber($formData['jabber']);
$user->save();
- // Language and timezone settings are saved on a per-user basis
- // By default, the default language, and timezone setting on
- // preferences page is what gets assigned.
- Application_Model_Preference::SetUserLocale();
- Application_Model_Preference::SetUserTimezone();
-
$form->reset();
$this->view->form = $form;
@@ -83,7 +77,7 @@ class UserController extends Zend_Controller_Action
} else {
$this->view->successMessage = ""._("User updated successfully!")."
";
}
-
+
$this->_helper->json->sendJson(array("valid"=>"true", "html"=>$this->view->render('user/add-user.phtml')));
} else {
$this->view->form = $form;
From eecd3fa188cacc16b787a7b336213d4809682e3e Mon Sep 17 00:00:00 2001
From: Duncan Sommerville
Date: Wed, 5 Nov 2014 17:24:08 -0500
Subject: [PATCH 11/21] Added setDefaults call to initialize the locale field
to user's locale, or the station default; removed unnecessary field
---
airtime_mvc/application/forms/Login.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/airtime_mvc/application/forms/Login.php b/airtime_mvc/application/forms/Login.php
index 40f4da83f..b8d3989c2 100644
--- a/airtime_mvc/application/forms/Login.php
+++ b/airtime_mvc/application/forms/Login.php
@@ -53,13 +53,11 @@ class Application_Form_Login extends Zend_Form
$locale->setMultiOptions(Application_Model_Locale::getLocales());
$locale->setDecorators(array('ViewHelper'));
$this->addElement($locale);
+ $this->setDefaults(array(
+ "locale" => Application_Model_Locale::getUserLocale()
+ ));
- $recaptchaNeeded = false;
if (Application_Model_LoginAttempts::getAttempts($_SERVER['REMOTE_ADDR']) >= 3) {
- $recaptchaNeeded = true;
- }
- if ($recaptchaNeeded) {
- // recaptcha
$this->addRecaptcha();
}
From e5e7942b4233a675be549a47ac6c56796524da32 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville
Date: Wed, 5 Nov 2014 17:24:54 -0500
Subject: [PATCH 12/21] Added getUserLocale function to pull locale data into
the Login form
---
airtime_mvc/application/models/Locale.php | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/airtime_mvc/application/models/Locale.php b/airtime_mvc/application/models/Locale.php
index 726302a82..e5ada5995 100644
--- a/airtime_mvc/application/models/Locale.php
+++ b/airtime_mvc/application/models/Locale.php
@@ -47,5 +47,22 @@ class Application_Model_Locale
textdomain($domain);
bind_textdomain_codeset($domain, $codeset);
}
+
+ /**
+ * We need this function for the case where a user has logged out, but
+ * has an airtime_locale cookie containing their locale setting.
+ *
+ * If the user does not have an airtime_locale cookie set, we default
+ * to the station locale.
+ *
+ * When the user logs in, the value set in the login form will be passed
+ * into the airtime_locale cookie. This cookie is also updated when
+ * a user updates their user settings.
+ */
+ public static function getUserLocale() {
+ $request = Zend_Controller_Front::getInstance()->getRequest();
+ $locale = $request->getCookie('airtime_locale', Application_Model_Preference::GetLocale());
+ return $locale;
+ }
}
From 534b56351ecea05741eb37fc659e65ab9f3d14b8 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville
Date: Wed, 5 Nov 2014 17:26:05 -0500
Subject: [PATCH 13/21] Added styles to completely hide csrf elements on the
page; changed tabs to spaces
---
airtime_mvc/public/css/styles.css | 2289 +++++++++++++++--------------
1 file changed, 1148 insertions(+), 1141 deletions(-)
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index a63f4975e..098f4d55d 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -2,8 +2,8 @@
/* CSS Document */
body {
- font-size: 62.5%;
- font-family:Arial, Helvetica, sans-serif;
+ font-size: 62.5%;
+ font-family:Arial, Helvetica, sans-serif;
background: #7f7f7f;
margin: 0;
padding: 0;
@@ -16,8 +16,8 @@ html, body {
background: #1f1f1f url(images/login_page_bg.png) no-repeat center 0;`
margin: 0;
padding: 0;
- height:100%;
- text-align:center;
+ height:100%;
+ text-align:center;
}
h2 {
@@ -28,59 +28,59 @@ h2 {
padding: 0 0 10px;
}
h3 {
- font-size:1.7em;
- font-weight:normal;
- color:#000;
- padding:0 0 10px 0;
- margin:0;
+ font-size:1.7em;
+ font-weight:normal;
+ color:#000;
+ padding:0 0 10px 0;
+ margin:0;
}
a, a:focus {
- outline:none;
+ outline:none;
}
label {
- font-size:12px;
+ font-size:12px;
}
select {
- font-size:12px;
- font-family:Arial, Helvetica, sans-serif;
- border:1px solid #9d9d9d;
+ font-size:12px;
+ font-family:Arial, Helvetica, sans-serif;
+ border:1px solid #9d9d9d;
}
.logo {
- position:absolute;
- right:20px;
- top:104px;
- background:transparent url(images/airtime_logo.png) no-repeat 0 0;
- height:35px;
- width:66px;
- z-index:1000;
- display:block;
+ position:absolute;
+ right:20px;
+ top:104px;
+ background:transparent url(images/airtime_logo.png) no-repeat 0 0;
+ height:35px;
+ width:66px;
+ z-index:1000;
+ display:block;
}
/* Version Notification Starts*/
#version-icon {
- position:absolute;
- right:96px;
- top:104px;
- height:35px;
- width:35px;
- z-index:1000;
- display:block;
+ position:absolute;
+ right:96px;
+ top:104px;
+ height:35px;
+ width:35px;
+ z-index:1000;
+ display:block;
cursor:pointer;
background-repeat:no-repeat;
background-position:center;
}
#version-icon.outdated {
- background-image:url(images/icon_outdated.png);
+ background-image:url(images/icon_outdated.png);
}
#version-icon.update2 {
- background-image:url(images/icon_update2.png);
+ background-image:url(images/icon_update2.png);
}
#version-icon.update {
- background-image:url(images/icon_update.png);
+ background-image:url(images/icon_update.png);
}
#version-icon.uptodate {
- background-image:url(images/icon_uptodate.png);
+ background-image:url(images/icon_uptodate.png);
}
#ui-tooltip-version a {
@@ -137,34 +137,34 @@ select {
}
/* Clearfix */
-.clearfix:after, #side_playlist li:after { content: "."; display: block; height: 0; clear: both; visibility: hidden;}
-.clearfix, #side_playlist li { display: inline-block; }
+.clearfix:after, #side_playlist li:after { content: "."; display: block; height: 0; clear: both; visibility: hidden;}
+.clearfix, #side_playlist li { display: inline-block; }
* html .clearfix, * html li { height: 1%;}
-.clearfix, #side_playlist li { display: block; }
+.clearfix, #side_playlist li { display: block; }
/* Master Panel */
#sticky {
- position:fixed;
- height:130px;
- top:0;
- left:0;
+ position:fixed;
+ height:130px;
+ top:0;
+ left:0;
}
#master-panel {
- background:#3d3d3d url(images/masterpanel_bg.png) repeat-x 0 0;
- height:100px;
- border:1px solid #000;
- border-width: 1px 0;
- overflow:hidden;
- position:relative;
+ background:#3d3d3d url(images/masterpanel_bg.png) repeat-x 0 0;
+ height:100px;
+ border:1px solid #000;
+ border-width: 1px 0;
+ overflow:hidden;
+ position:relative;
}
.now-playing-block, .show-block, .on-air-block, .time-info-block, .personal-block, .listen-control-block, .trial-info-block {
- height:100px;
- float:left;
- margin-right:10px;
+ height:100px;
+ float:left;
+ margin-right:10px;
}
.source-info-block {
@@ -174,207 +174,207 @@ select {
}
.personal-block {
- float:right;
- margin-right:20px;
- text-align:right;
- min-width:110px;
+ float:right;
+ margin-right:20px;
+ text-align:right;
+ min-width:110px;
}
.personal-block ul {
- margin:0;
- padding:8px 0 0;
+ margin:0;
+ padding:8px 0 0;
}
.personal-block li {
- font-size:11px;
- color:#bdbdbd;
- list-style-type:none;
- margin:0 0 2px 0;
+ font-size:11px;
+ color:#bdbdbd;
+ list-style-type:none;
+ margin:0 0 2px 0;
}
.personal-block li.name {
- color:#fff;
- font-weight:normal;
+ color:#fff;
+ font-weight:normal;
}
.personal-block li a {
- color:#fff;
- text-decoration:underline;
+ color:#fff;
+ text-decoration:underline;
}
.personal-block li a:hover {
- color:#ff5d1a;
+ color:#ff5d1a;
}
.now-playing-block {
- width:35%;
- padding-left:10px;
+ width:35%;
+ padding-left:10px;
}
.show-block {
- width:30%;
+ width:30%;
}
.text-row {
- height:30px;
- padding:0px 0 0;
- font-size:12px;
- text-wrap:none;
- text-indent:2px;
- overflow:hidden;
- line-height:30px;
+ height:30px;
+ padding:0px 0 0;
+ font-size:12px;
+ text-wrap:none;
+ text-indent:2px;
+ overflow:hidden;
+ line-height:30px;
}
#master-panel .text-row {
- color:#dfdfdf;
+ color:#dfdfdf;
}
.text-row.next-song {
- color:#d9d9d9;
+ color:#d9d9d9;
}
.text-row strong {
- font-weight:bold;
- color:#969696;
- padding-right:12px;
+ font-weight:bold;
+ color:#969696;
+ padding-right:12px;
}
.text-row.rebroadcast, #master-panel .text-row.rebroadcast {
- color:#969696;
+ color:#969696;
}
.now-playing-info {
- height:25px;
- background:#3a3a3a url(images/playinfo_bg.png) repeat-x 0 0;
- border: 1px solid #242424;
- border-bottom-color:#727272;
- -moz-border-radius: 2px;
- -webkit-border-radius: 2px;
- border-radius: 2px;
- color:#fff;
- font-size:15px;
- line-height:22px;
- text-indent:5px;
- overflow:hidden;
- margin-bottom:3px;
+ height:25px;
+ background:#3a3a3a url(images/playinfo_bg.png) repeat-x 0 0;
+ border: 1px solid #242424;
+ border-bottom-color:#727272;
+ -moz-border-radius: 2px;
+ -webkit-border-radius: 2px;
+ border-radius: 2px;
+ color:#fff;
+ font-size:15px;
+ line-height:22px;
+ text-indent:5px;
+ overflow:hidden;
+ margin-bottom:3px;
}
.time-elapsed {
- color:#c4c4c4;
- padding-right:6px;
+ color:#c4c4c4;
+ padding-right:6px;
}
.time-remaining {
- color:#ff6f01;
+ color:#ff6f01;
}
.progressbar {
- height:6px;
- border:1px solid #242424;
- border-width:1px 1px 0 1px;
- background:#141414 url(images/progressbar_bg.png) repeat-x 0 0;
+ height:6px;
+ border:1px solid #242424;
+ border-width:1px 1px 0 1px;
+ background:#141414 url(images/progressbar_bg.png) repeat-x 0 0;
}
.progressbar .progress-song, .progressbar .progress-show, .progressbar .progress-show-error {
- height:4px;
- width:0%;
- background:#f97202 url(images/progressbar_song.png) repeat-x 0 0;
+ height:4px;
+ width:0%;
+ background:#f97202 url(images/progressbar_song.png) repeat-x 0 0;
}
.progressbar .progress-show {
- background:#02cef9 url(images/progressbar_show.png) repeat-x 0 0;
+ background:#02cef9 url(images/progressbar_show.png) repeat-x 0 0;
}
.progressbar .progress-show-error {
- background:#d40000 url(images/progressbar_show_error.png) repeat-x 0 0;
+ background:#d40000 url(images/progressbar_show_error.png) repeat-x 0 0;
}
.now-playing-info .show-length {
- color:#c4c4c4;
- padding-left:6px;
+ color:#c4c4c4;
+ padding-left:6px;
}
.now-playing-info .song-length {
- color:#9b9b9b;
- padding-right:6px;
+ color:#9b9b9b;
+ padding-right:6px;
}
.on-air-block {
- padding:0 12px 0 0;
- background:url(images/masterpanel_spacer.png) no-repeat right 0;
+ padding:0 12px 0 0;
+ background:url(images/masterpanel_spacer.png) no-repeat right 0;
}
.time-info-block {
- padding:0 14px 0 2px;
- min-width:105px;
+ padding:0 14px 0 2px;
+ min-width:105px;
}
.time-info-block ul {
- margin:0;
- padding:6px 0 0;
+ margin:0;
+ padding:6px 0 0;
}
.time-info-block li {
- list-style-type:none;
- font-size:14px;
- color:#bdbdbd;
- margin:0 0 6px;
+ list-style-type:none;
+ font-size:14px;
+ color:#bdbdbd;
+ margin:0 0 6px;
}
.time-info-block li.time {
- font-size:26px;
- color:#fff;
- width:auto;
- text-align:left;
+ font-size:26px;
+ color:#fff;
+ width:auto;
+ text-align:left;
}
.time-info-block li.time-zone {
- font-size:17px;
- margin-bottom:0;
+ font-size:17px;
+ margin-bottom:0;
}
.listen-control-block a, .listen-control-button {
- font-size:11px;
- text-transform:uppercase;
- padding:0;
- border:1px solid #242424;
- color:#fff;
- text-decoration:none;
- font-weight:bold;
- margin-top:34px;
- display:block;
- text-align:center;
-
+ font-size:11px;
+ text-transform:uppercase;
+ padding:0;
+ border:1px solid #242424;
+ color:#fff;
+ text-decoration:none;
+ font-weight:bold;
+ margin-top:34px;
+ display:block;
+ text-align:center;
+
}
.listen-control-button {
- margin-top:6px;
+ margin-top:6px;
}
.listen-control-block a span, .listen-control-button span {
- background-color: #6e6e6e;
+ background-color: #6e6e6e;
background: -moz-linear-gradient(top, #868686 0, #6e6e6e 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #868686), color-stop(100%, #6e6e6e));
- padding:5px 10px;
- border:1px solid #a1a1a1;
- border-width:1px 0;
- border-bottom-color:#646464;
- color:#dcdcdc;
- text-shadow: #555555 0px -1px;
- display:block;
+ padding:5px 10px;
+ border:1px solid #a1a1a1;
+ border-width:1px 0;
+ border-bottom-color:#646464;
+ color:#dcdcdc;
+ text-shadow: #555555 0px -1px;
+ display:block;
}
.listen-control-button span {
- padding:2px 10px;
+ padding:2px 10px;
}
.listen-control-block a:hover, .listen-control-button:hover {
- border:1px solid #000;
+ border:1px solid #000;
}
.listen-control-block a:hover span, .listen-control-button:hover span {
- background-color: #292929;
+ background-color: #292929;
background: -moz-linear-gradient(top, #3b3b3b 0, #292929 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3b3b3b), color-stop(100%, #292929));
- border:1px solid #555555;
- border-width:1px 0;
- border-bottom-color:#1e1e1e;
- color:#fff;
- color:#0C0;
- text-shadow: #000 0px -1px;
- display:block;
+ border:1px solid #555555;
+ border-width:1px 0;
+ border-bottom-color:#1e1e1e;
+ color:#fff;
+ color:#0C0;
+ text-shadow: #000 0px -1px;
+ display:block;
}
.listen-control-block a:active span {
- color:#fff;
+ color:#fff;
}
/* END Master Panel */
.wrapper {
- margin: 0 5px 0 5px;
- padding:10px 0 0 0;
+ margin: 0 5px 0 5px;
+ padding:10px 0 0 0;
}
.alpha-block {
- padding:0;
- float:left;
- margin:0 16px 10px 0;
+ padding:0;
+ float:left;
+ margin:0 16px 10px 0;
}
.omega-block {
- padding:0;
- float:left;
- margin:0 0 10px 0;
+ padding:0;
+ float:left;
+ margin:0 0 10px 0;
}
.block-shadow {
-moz-box-shadow: 0 2px 2px rgba(0,0,0,.10);
@@ -390,32 +390,32 @@ select {
width: 0;
}
fieldset.plain {
- border:none;
- padding:0;
- margin:0;
+ border:none;
+ padding:0;
+ margin:0;
}
.frame {
- padding:0;
- border:1px solid #5b5b5b;
- margin: 0 0 8px 0;
+ padding:0;
+ border:1px solid #5b5b5b;
+ margin: 0 0 8px 0;
}
.padded {
- padding:8px;
+ padding:8px;
}
.padded-strong {
- padding:10px;
+ padding:10px;
}
.input_text, input[type="text"], input[type="password"] {
- font-family:Arial, Helvetica, sans-serif;
- border: 1px solid #5b5b5b;
+ font-family:Arial, Helvetica, sans-serif;
+ border: 1px solid #5b5b5b;
font-size: 12px;
/*height: 23px;*/
margin: 0;
padding: 4px 3px;
/*text-indent: 3px;*/
- width:auto;
+ width:auto;
background-color: #dddddd;
- border: 1px solid #5b5b5b;
+ border: 1px solid #5b5b5b;
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;
}
@@ -424,25 +424,25 @@ input[readonly]{
}
input[type="text"]:focus, input[type="password"]:focus, textarea:focus, .input_text_area:focus {
- border: 1px solid #0088f1;
- outline: none;
+ border: 1px solid #0088f1;
+ outline: none;
}
.auto-search {
- background:#dddddd url(images/search_auto_bg.png) no-repeat 0 0;
- text-indent:25px;
+ background:#dddddd url(images/search_auto_bg.png) no-repeat 0 0;
+ text-indent:25px;
}
.input_text_area, textarea {
background-color: #dddddd;
- border: 1px solid #5b5b5b;
+ border: 1px solid #5b5b5b;
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;
font-size: 13px;
text-indent: 3px;
- margin:0;
+ margin:0;
}
.input_select, select {
background-color: #DDDDDD;
- box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;
- border: 1px solid #5b5b5b;
+ box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;
+ border: 1px solid #5b5b5b;
font-family: Arial,Helvetica,sans-serif;
font-size: 12px;
height: 25px;
@@ -539,7 +539,7 @@ table.library-get-file-md.table-small{
.webstream {
color: #4eba70;
}
-
+
/***** LIBRARY QTIP METADATA SPECIFIC STYLES END *****/
@@ -583,10 +583,10 @@ input.input_text.sp_extra_input_text{
}
.sp-ui-button-icon-only {
- position: relative;
- top: 5px;
- margin-top: -10px;
- margin-left: 5px;
+ position: relative;
+ top: 5px;
+ margin-top: -10px;
+ margin-left: 5px;
}
.sp-ui-button-icon-only .ui-icon-closethick:hover, .sp-ui-button-icon-only .ui-icon-plusthick:hover {
@@ -621,14 +621,14 @@ input.input_text.sp_extra_input_text{
}
.sp-closed{
- border-width: 0 0 0 !important;
+ border-width: 0 0 0 !important;
}
/***** SMART BLOCK SPECIFIC STYLES END *****/
label {
- font-size:13px;
- color:#5b5b5b;
- padding:0 16px 0 0;
+ font-size:13px;
+ color:#5b5b5b;
+ padding:0 16px 0 0;
}
.static_text {
font-size:13px;
@@ -637,61 +637,61 @@ label {
word-wrap: break-word;
}
#library_quick_search {
- margin-bottom:16px;
+ margin-bottom:16px;
}
#library_quick_search label {
}
#library_quick_search input {
- width:60%;
+ width:60%;
}
dl.inline-list {
- float: left;
- margin: 0;
- padding: 0;
+ float: left;
+ margin: 0;
+ padding: 0;
}
dl.inline-list dt {
- clear: left;
- float: left;
- margin: 0;
- padding: 0px 0;
- font-weight: bold;
- color:#333333;
- font-size:12px;
- font-weight:bold;
- text-align:left;
- min-width:70px;
+ clear: left;
+ float: left;
+ margin: 0;
+ padding: 0px 0;
+ font-weight: bold;
+ color:#333333;
+ font-size:12px;
+ font-weight:bold;
+ text-align:left;
+ min-width:70px;
}
dl.inline-list dd {
- float: left;
- margin: 0;
- padding: 0px 0 4px 15px;
- font-size:12px;
+ float: left;
+ margin: 0;
+ padding: 0px 0 4px 15px;
+ font-size:12px;
}
.left-floated {
- float:left;
- margin-left:0;
- margin-right:10px;
+ float:left;
+ margin-left:0;
+ margin-right:10px;
}
.right-floated {
- float:right;
- margin-left:10px;
- margin-right:0;
- text-align:right;
+ float:right;
+ margin-left:10px;
+ margin-right:0;
+ text-align:right;
}
/*----Data Table----*/
.datatable tr th.ui-state-default {
border: 1px solid #CCC;
- border-width: 0 0 0 1px !important;
+ border-width: 0 0 0 1px !important;
}
.datatable {
border-color: #5b5b5b;
border-style: solid;
border-width: 1px 1px 1px 1px;
- width:100%;
+ width:100%;
}
.datatable th {
@@ -711,7 +711,7 @@ dl.inline-list dd {
.even {
background-color:#c7c7c7;
}
-
+
.datatable tr.even.selected td {
background-color: #abcfe2;
}
@@ -723,7 +723,7 @@ dl.inline-list dd {
}
.datatable tr td:first-child, .datatable tr th:first-child, .datatable tr th.ui-state-default:first-child {
- border-left-width:0 !important;
+ border-left-width:0 !important;
}
.ui-widget-header + .datatable {
border-width: 0px 1px 1px 1px;
@@ -749,7 +749,7 @@ dl.inline-list dd {
.DataTables_sort_wrapper .ui-icon {
display: block;
float: left;
- margin: 0 3px 0 -2px;
+ margin: 0 3px 0 -2px;
}
.dataTables_type {
float:right;
@@ -758,72 +758,72 @@ dl.inline-list dd {
}
.dataTables_length {
- float:right;
- margin:0;
-
+ float:right;
+ margin:0;
+
}
.dataTables_length label {
- padding:0;
- font-size:12px;
- color:#404040;
- line-height:24px;
+ padding:0;
+ font-size:12px;
+ color:#404040;
+ line-height:24px;
}
.dataTables_filter {
- margin:0 0 8px 8px;
+ margin:0 0 8px 8px;
}
.dataTables_filter .auto-search {
- width:55%;
+ width:55%;
}
.dt-process-rel {
- position: relative;
+ position: relative;
}
.dataTables_processing {
- opacity: 1 !important;
- position: absolute;
- top: 100px;
- left: 10%;
- width: 80%;
- height: 50px;
- text-align: center;
- font-size:14px;
- font-weight:bold;
- padding-top: 40px;
- background: -moz-linear-gradient(top, #b2b2b2 0, #a2a2a2 100%);
+ opacity: 1 !important;
+ position: absolute;
+ top: 100px;
+ left: 10%;
+ width: 80%;
+ height: 50px;
+ text-align: center;
+ font-size:14px;
+ font-weight:bold;
+ padding-top: 40px;
+ background: -moz-linear-gradient(top, #b2b2b2 0, #a2a2a2 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #b2b2b2), color-stop(100%, #a2a2a2));
background: linear-gradient(top, #b2b2b2 0, #a2a2a2 100%);
border: 1px solid #8F8F8F;
color: #ffffff;
}
#library_display_wrapper .ui-widget-header:first-child {
- background:none;
+ background:none;
border-width:0 0 1px 0;
color: #444444;
font-weight: bold;
}
#library_display_wrapper .ui-widget-header:first-child .dataTables_length {
- margin:0;
+ margin:0;
}
#library_display_wrapper .ui-widget-header:first-child .dataTables_filter {
- margin:0;
+ margin:0;
}
.dataTables_info {
- float: left;
- padding: 8px 0 0 8px;
- font-size:12px;
- color:#555555;
- font-weight:normal;
+ float: left;
+ padding: 8px 0 0 8px;
+ font-size:12px;
+ color:#555555;
+ font-weight:normal;
}
.dataTables_paginate {
- float: right;
- padding: 8px 0 8px 8px;
+ float: right;
+ padding: 8px 0 8px 8px;
}
.dataTables_paginate .ui-button {
- font-size:12px;
- font-weight:normal;
+ font-size:12px;
+ font-weight:normal;
padding: 0.2em 1em;
- margin-right:3px;
+ margin-right:3px;
}
.dataTables_filter input {
background: url("images/search_auto_bg.png") no-repeat scroll 0 0 #DDDDDD;
@@ -888,30 +888,37 @@ fieldset.plain {
padding: 0;
}
input[type="checkbox"] {
- margin:0;
- outline:none;
- padding:0;
- width:13px;
- height:13px;
+ margin:0;
+ outline:none;
+ padding:0;
+ width:13px;
+ height:13px;
}
/*---//////////////////// LOGIN & PASSWORD RESET ////////////////////---*/
+#csrf-label, #csrf-element {
+ /* Remove any visible csrf form token footprint */
+ height: 0;
+ padding: 0;
+ margin: 0;
+}
+
.login_box {
margin: 0 auto 0 auto;
text-align:center;
width:420px;
border:1px solid #181818;
- border-width: 0 0 1px 0;
- padding:0;
- padding-top:60px;
+ border-width: 0 0 1px 0;
+ padding:0;
+ padding-top:60px;
}
.login_box h2 {
- background:#1f1f1f;
+ background:#1f1f1f;
background: -moz-linear-gradient(center top , #2c2c2c 0pt, #1f1f1f 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #2c2c2c), color-stop(100%, #1f1f1f));
border:1px solid #181818;
- border-top-color:#4f4f4f;
+ border-top-color:#4f4f4f;
margin:0;
padding:8px 0 8px 20px;
font-size:15px;
@@ -932,7 +939,7 @@ input[type="checkbox"] {
.logobox {
height:120px;
text-align:center;
- background:url(images/airtime_logo_big.png) no-repeat 50% 0;
+ background:url(images/airtime_logo_big.png) no-repeat 50% 0;
}
.login {
@@ -948,7 +955,7 @@ input[type="checkbox"] {
.login td {
border:none;
background-color:transparent;
- color:#696969;
+ color:#696969;
}
.login h2 {
@@ -959,20 +966,20 @@ input[type="checkbox"] {
color:#1683b0;
}
.alert {
- color:#C00;
+ color:#C00;
}
.login-content {
- background:url(images/login_content_bg.png) no-repeat 0 bottom;
- padding:10px 20px 14px;
- text-align:left;
+ background:url(images/login_content_bg.png) no-repeat 0 bottom;
+ padding:10px 20px 14px;
+ text-align:left;
}
.login-content dl, .login-content dl.zend_form {
- margin: 12px 0 0 0;
- margin-bottom:8px;
- margin:0;
- padding:0;
- width:100%;
+ margin: 12px 0 0 0;
+ margin-bottom:8px;
+ margin:0;
+ padding:0;
+ width:100%;
}
.login-content dd {
@@ -980,7 +987,7 @@ input[type="checkbox"] {
font-size: 1.2em;
margin: 0;
padding: 0 0 9px 0;
- display:block;
+ display:block;
}
.login-content dt {
color: #666666;
@@ -990,34 +997,34 @@ input[type="checkbox"] {
margin: 0;
padding: 0 0 6px 0;
text-align: left;
- min-width:90px;
- clear:left;
- display:block;
+ min-width:90px;
+ clear:left;
+ display:block;
}
dt.block-display, dd.block-display {
- display:block;
- float:none;
- margin-left:0;
- padding-left:0;
+ display:block;
+ float:none;
+ margin-left:0;
+ padding-left:0;
}
.login-content dt label {
padding-right:0;
- color:#a8a8a8;
+ color:#a8a8a8;
}
.login-content dd .input_text, .login-content dd input[type="text"], .login-content dd input[type="password"] {
- width:99%;
- font-size:14px;
- padding: 6px 0 6px 3px;
+ width:99%;
+ font-size:14px;
+ padding: 6px 0 6px 3px;
}
.login-content dd select {
width: 100%;
}
.login-content dd input.ui-button, .login-content dd input.btn {
- width:100%;
- font-size:14px;
- padding: 6px 10px 6px;
+ width:100%;
+ font-size:14px;
+ padding: 6px 10px 6px;
}
.login-content dd button.ui-button, .login-content dd button.btn {
@@ -1026,18 +1033,18 @@ dt.block-display, dd.block-display {
padding: 6px 10px 6px;
}
.login-content .hidden, .hidden {
- display:none;
+ display:none;
}
.login-content .text-right, .text-right {
- text-align:right;
+ text-align:right;
}
.login-content .link {
- color:#FF5D1A;
- text-decoration:none;
- }
- .login-content .link:hover {
- text-decoration:underline;
- }
+ color:#FF5D1A;
+ text-decoration:none;
+ }
+ .login-content .link:hover {
+ text-decoration:underline;
+ }
/*---//////////////////// END LOGIN ////////////////////---*/
@@ -1047,7 +1054,7 @@ dt.block-display, dd.block-display {
display:block;
height:40px;
clear:both;
- color:#4b4b4b;
+ color:#4b4b4b;
margin-top:12px;
font-size:11px;
line-height:140%;
@@ -1060,7 +1067,7 @@ dt.block-display, dd.block-display {
text-decoration:none;
}
#login-page .footer {
- color:#6d6d6d;
+ color:#6d6d6d;
}
.footer a:hover {
color:#ff5d1a;
@@ -1069,27 +1076,27 @@ dt.block-display, dd.block-display {
/*---//////////////////// END FOOTER ////////////////////---*/
.button-bar {
- height: 28px;
- margin-top:12px;
+ height: 28px;
+ margin-top:12px;
}
/*.sticky {
- padding:0;
- width:100%;
- z-index:2000;
- position:fixed;
- top:0;
- left:0;
- margin-bottom:140px;
+ padding:0;
+ width:100%;
+ z-index:2000;
+ position:fixed;
+ top:0;
+ left:0;
+ margin-bottom:140px;
}*/
.sticky {
- padding:0;
- width:100%;
+ padding:0;
+ width:100%;
}
.floated-panel {
- margin-top:0;
- width:99.99%;
- z-index:999;
+ margin-top:0;
+ width:99.99%;
+ z-index:999;
}
@@ -1097,15 +1104,15 @@ dt.block-display, dd.block-display {
#schedule_playlist_dialog .wrapp-two {
- float: left;
- width: 50%;
- padding: 0;
+ float: left;
+ width: 50%;
+ padding: 0;
}
#schedule_playlist_dialog .wrapp-one {
- margin-right:2%;
- width: 48%;
- float: left;
+ margin-right:2%;
+ width: 48%;
+ float: left;
}
#schedule_playlist_dialog div:first-child .ui-widget-header:first-child {
@@ -1127,7 +1134,7 @@ dt.block-display, dd.block-display {
}
.ui-dialog #schedule_playlist_dialog.ui-dialog-content {
- padding:0;
+ padding:0;
}
@@ -1135,15 +1142,15 @@ dt.block-display, dd.block-display {
background: none repeat scroll 0 0 transparent;
border: 1px solid #8f8f8f;
padding: 8px;
- margin:8px 8px 0 8px;
+ margin:8px 8px 0 8px;
}
#schedule_playlist_dialog > div h4 {
padding: 13px 0 12px 0;
margin: 0;
- font-size:16px;
- font-weight:normal;
+ font-size:16px;
+ font-weight:normal;
}
#schedule_calendar {
@@ -1151,13 +1158,13 @@ dt.block-display, dd.block-display {
}
#schedule_block_table {
- width: 100%;
+ width: 100%;
}
thead tr.fc-first
{
- height: 32px;
- line-height: 32px;
+ height: 32px;
+ line-height: 32px;
}
/** Extremely nasty workaround for a fullcalendar bug, where clicking "Add Show"
@@ -1169,7 +1176,7 @@ thead tr.fc-first
div.fc-agenda > div:nth-child(2)
{
- top: 34px !important;
+ top: 34px !important;
}
#schedule_calendar_cell
@@ -1182,91 +1189,91 @@ div.fc-agenda > div:nth-child(2)
.schedule_change_slots /** The time span combobox */
{
- margin-top: 4px; /** Center it vertically */
+ margin-top: 4px; /** Center it vertically */
}
#schedule_block_table td {
- padding: 0px;
- vertical-align: top;
+ padding: 0px;
+ vertical-align: top;
}
div.ui-datepicker {
- /*font-size: 75%;*/
+ /*font-size: 75%;*/
}
#schedule_playlist_dialog ul {
- list-style-type: none;
- overflow: auto;
- margin: 0 0 8px 0;
- padding: 0;
- height: 280px;
- background:#9a9a9a;
- width:100%;
+ list-style-type: none;
+ overflow: auto;
+ margin: 0 0 8px 0;
+ padding: 0;
+ height: 280px;
+ background:#9a9a9a;
+ width:100%;
}
#schedule_playlist_chosen li {
- float: left;
- clear: left;
- margin: 0;
- width: 100%;
- display:block;
- margin-bottom:-1px;
+ float: left;
+ clear: left;
+ margin: 0;
+ width: 100%;
+ display:block;
+ margin-bottom:-1px;
}
#schedule_playlist_chosen li > h3 {
- font-size:15px;
- padding: 7px 0 0 0;
- margin: 0;
- min-height:25px;
+ font-size:15px;
+ padding: 7px 0 0 0;
+ margin: 0;
+ min-height:25px;
}
#schedule_playlist_chosen li > h3 > div {
- float: left;
- margin: 0 5px 2px 0;
+ float: left;
+ margin: 0 5px 2px 0;
}
#schedule_playlist_chosen li > h3 > div > span.ui-icon {
- margin-top: 0px;
+ margin-top: 0px;
}
#schedule_playlist_chosen li > h3 > span.ui-icon.ui-icon-triangle-1-e,
#schedule_playlist_chosen li > h3 > span.ui-icon.ui-icon-triangle-1-s {
- float:left;
- margin-right: 8px;
+ float:left;
+ margin-right: 8px;
}
#schedule_playlist_chosen li > h3 > span.ui-icon.ui-icon-close {
- float:right;
- margin-right: 8px;
+ float:right;
+ margin-right: 8px;
}
#schedule_playlist_chosen div.group_list {
- border-width:0 1px 1px 1px;
+ border-width:0 1px 1px 1px;
}
/*#schedule_playlist_chosen li div{
- float: left;
+ float: left;
}
#schedule_playlist_chosen li > div{
- width: 475px;
+ width: 475px;
}
*/
#schedule_playlist_chosen li > div > div{
- clear: left;
- padding-top: 5px;
- padding-left: 5px;
+ clear: left;
+ padding-top: 5px;
+ padding-left: 5px;
}
#schedule_playlist_chosen li > div:first-child {
- border-bottom:1px solid #b1b1b1;
+ border-bottom:1px solid #b1b1b1;
}
.sched_description {
- clear: left;
- font-size: 85%;
- margin-left: 2em;
+ clear: left;
+ font-size: 85%;
+ margin-left: 2em;
}
.sh_pl_name {
- min-width: 150px;
+ min-width: 150px;
}
.sh_pl_creator {
@@ -1274,78 +1281,78 @@ div.ui-datepicker {
}
#schedule_playlist_chosen li > h3 > div.sh_pl_time {
- float:right;
- margin-right:22px;
+ float:right;
+ margin-right:22px;
}
#schedule_playlist_chosen li > div > div > span {
- float: right;
- margin-right:46px;
+ float: right;
+ margin-right:46px;
}
#schedule_playlist_chosen li > div > div > span.sh_file_name {
- display: inline-block;
- float: left;
- margin-right:0;
+ display: inline-block;
+ float: left;
+ margin-right:0;
}
.sh_file_artist, #schedule_playlist_chosen li > div > div.sh_file_artist {
- font-size: 11px;
- padding-top: 2px;
- padding-bottom: 8px;
- color:#5b5b5b;
+ font-size: 11px;
+ padding-top: 2px;
+ padding-bottom: 8px;
+ color:#5b5b5b;
}
#schedule_playlist_chosen li > div > div.sched_description {
- font-size: 12px;
- padding-top: 5px;
- padding-bottom: 7px;
- border-bottom:1px solid #b1b1b1;
- color:#5b5b5b;
- margin:0;
- background:#dddddd;
+ font-size: 12px;
+ padding-top: 5px;
+ padding-bottom: 7px;
+ border-bottom:1px solid #b1b1b1;
+ color:#5b5b5b;
+ margin:0;
+ background:#dddddd;
}
#show_time_info {
- font-size:12px;
- height:30px;
+ font-size:12px;
+ height:30px;
}
#show_time_info > div, #show_time_info > span{
- float: left;
+ float: left;
}
#show_progressbar {
- width: 46%;
- height: 5px;
- margin: 9px 9px 0 0;
+ width: 46%;
+ height: 5px;
+ margin: 9px 9px 0 0;
}
#show_progressbar.ui-widget-content {
- background: #646464 url(images/schedule-show_progressbar_bg.png) repeat-x 0 0;
- border-color:#343434;
- border-bottom-color:#cfcfcf;
+ background: #646464 url(images/schedule-show_progressbar_bg.png) repeat-x 0 0;
+ border-color:#343434;
+ border-bottom-color:#cfcfcf;
}
#show_progressbar .ui-progressbar-value {
- background: #ff5d1a;
- border-color:#343434;
- border-width: 1px 0 0 1px;
+ background: #ff5d1a;
+ border-color:#343434;
+ border-width: 1px 0 0 1px;
}
h2#scheduled_playlist_name {
- font-size:21px;
- font-weight:normal;
- margin:0;
- padding:8px 0 0px 12px;
- color:#1c1c1c;
+ font-size:21px;
+ font-weight:normal;
+ margin:0;
+ padding:8px 0 0px 12px;
+ color:#1c1c1c;
}
h2#scheduled_playlist_name span {
- color:#656565;
+ color:#656565;
}
.time {
- width: 80px;
- margin: 5px;
- text-align: left;
+ width: 80px;
+ margin: 5px;
+ text-align: left;
}
/* --- Add show Dialog --- */
@@ -1355,57 +1362,57 @@ h2#scheduled_playlist_name span {
}
#add_show_description {
- width: 400px;
- height: 200px;
+ width: 400px;
+ height: 200px;
}
#fullcalendar_show_display {
- width: 400px;
+ width: 400px;
}
.fc-agenda-body {
- max-height:560px;
+ max-height:560px;
}
#schedule_calendar .ui-progressbar {
- width: 46%;
- height: 5px;
- margin: 9px 9px 0 0;
+ width: 46%;
+ height: 5px;
+ margin: 9px 9px 0 0;
}
#schedule_calendar .ui-progressbar.ui-widget-content {
- background: #646464 url(images/schedule-show_progressbar_bg.png) repeat-x 0 0;
- border-color:#343434;
- border-bottom-color:#cfcfcf;
+ background: #646464 url(images/schedule-show_progressbar_bg.png) repeat-x 0 0;
+ border-color:#343434;
+ border-bottom-color:#cfcfcf;
}
#schedule_calendar .ui-progressbar .ui-progressbar-value {
- background: #ff5d1a;
- border-color:#343434;
- border-width: 1px 0 0 1px;
+ background: #ff5d1a;
+ border-color:#343434;
+ border-width: 1px 0 0 1px;
}
/*---//////////////////// Advenced Search ////////////////////---*/
.search_control {
- padding:8px;
- border:1pxp solid #8f8f8f;
- background:#d8d8d8;
- margin-bottom:8px;
+ padding:8px;
+ border:1pxp solid #8f8f8f;
+ background:#d8d8d8;
+ margin-bottom:8px;
}
.search_group {
- padding:8px;
- border:1pxp solid #8f8f8f;
- margin-bottom:8px;
+ padding:8px;
+ border:1pxp solid #8f8f8f;
+ margin-bottom:8px;
}
.search_group > fieldset {
- padding:0;
- border:none;
- margin-top:8px;
+ padding:0;
+ border:none;
+ margin-top:8px;
}
.search_group > fieldset .input_text {
- width:45%;
+ width:45%;
}
.search_group > fieldset .input_text, .search_group > fieldset .input_select {
- margin-right:6px;
+ margin-right:6px;
}
.search_group fieldset .ui-button-icon-only .ui-button-text, .search_group fieldset .ui-button-icons-only .ui-button-text {
padding: 3px 2px;
@@ -1449,15 +1456,15 @@ h2#scheduled_playlist_name span {
font-size: 1.2em;
margin: 0;
padding: 4px 0 4px 15px;
- width:60%;
+ width:60%;
}
.simple-formblock .liquidsoap_status{
width: 100%;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
- padding: 4px 0 8px;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ padding: 4px 0 8px;
}
.user-form-label {
@@ -1473,11 +1480,11 @@ h2#scheduled_playlist_name span {
}
.stream-setting-content dd.block-display {
- /*width: 60%;*/
+ /*width: 60%;*/
}
.simple-formblock.padded-strong {
- padding:12px;
+ padding:12px;
}
.simple-formblock dd .input_text {
@@ -1485,11 +1492,11 @@ h2#scheduled_playlist_name span {
}
.simple-formblock h2 {
- font-size:1.7em;
- padding-bottom:16px;
+ font-size:1.7em;
+ padding-bottom:16px;
}
.simple-formblock label {
- padding:0;
+ padding:0;
}
.ui-button-icon-only.crossfade-main-button, .ui-button-icons-only.crossfade-main-button {
@@ -1504,28 +1511,28 @@ h2#scheduled_playlist_name span {
padding: 0.1em 1em;
}
-.ui-state-default .ui-icon.crossfade-main-icon {
- background:url(images/crossfade_main.png) no-repeat 0 2px;
- width:25px;
+.ui-state-default .ui-icon.crossfade-main-icon {
+ background:url(images/crossfade_main.png) no-repeat 0 2px;
+ width:25px;
}
.btn.crossfade-main-button span {
- text-indent: 100%;
- white-space: nowrap;
- overflow: hidden;
- display:inline-block;
- width: 0;
- height:0;
+ text-indent: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ display:inline-block;
+ width: 0;
+ height:0;
}
.btn i.crossfade-main-icon {
- display: inline-block;
- background:url(images/crossfade_main.png) no-repeat 0 2px;
- width:22px;
- height: 14px;
- line-height: 14px;
- vertical-align: text-top;
- margin-top: 1px;
- margin-right: -5px;
+ display: inline-block;
+ background:url(images/crossfade_main.png) no-repeat 0 2px;
+ width:22px;
+ height: 14px;
+ line-height: 14px;
+ vertical-align: text-top;
+ margin-top: 1px;
+ margin-right: -5px;
}
.ui-button-icon-only.crossfade-main-button .ui-icon {
@@ -1534,27 +1541,27 @@ h2#scheduled_playlist_name span {
}
button, input {
- margin-top:0;
- margin-bottom:0;
+ margin-top:0;
+ margin-bottom:0;
}
.user-management {
- width:910px;
- /*width:380px;*/
+ width:910px;
+ /*width:380px;*/
}
.user-management-expanded {
- width:910px;
+ width:910px;
}
.user-data {
- float:left;
- width:420px;
- margin-left:10px;
- /*display:none;*/
+ float:left;
+ width:420px;
+ margin-left:10px;
+ /*display:none;*/
}
.user-list-wrapper {
- float:left;
- width:480px;
- /*margin-right:10px;*/
+ float:left;
+ width:480px;
+ /*margin-right:10px;*/
}
.user-management div.user-list-wrapper .ui-widget-header:first-child {
@@ -1564,7 +1571,7 @@ button, input {
font-weight: bold;
}
.user-list-wrapper .ui-widget-header:first-child .dataTables_filter {
- margin:0;
+ margin:0;
}
.user-management h2 {
font-size: 1.7em;
@@ -1572,127 +1579,127 @@ button, input {
}
.user-management .dataTables_filter input {
width: 93.8%;
- margin-bottom:8px;
+ margin-bottom:8px;
}
.user-data.simple-formblock dd {
width: 73%;
}
.user-data fieldset {
- margin-bottom:8px;
+ margin-bottom:8px;
}
.user-data fieldset:last-child {
- margin-bottom:0;
+ margin-bottom:0;
}
.user-list-wrapper .button-holder {
- padding:0;
- text-align:right;
- height:37px;
+ padding:0;
+ text-align:right;
+ height:37px;
}
.user-list-wrapper .button-holder .ui-button {
- margin:0;
+ margin:0;
}
.ui-widget-content .user-list-wrapper .ui-icon.ui-icon-closethick {
- background-image:url(redmond/images/ui-icons_666666_256x240.png);
- cursor:pointer;
- float:right;
- margin-right:5px;
+ background-image:url(redmond/images/ui-icons_666666_256x240.png);
+ cursor:pointer;
+ float:right;
+ margin-right:5px;
}
.ui-widget-content .user-list-wrapper .ui-icon.ui-icon-closethick:hover {
- background-image:url(redmond/images/ui-icons_ff5d1a_256x240.png);
+ background-image:url(redmond/images/ui-icons_ff5d1a_256x240.png);
}
.button-bar-top {
- text-align:right;
- height:38px;
+ text-align:right;
+ height:38px;
}
.toggle-button, .toggle-button-active {
- border: 1px solid #505050;
- background-color: #5e5e5e;
+ border: 1px solid #505050;
+ background-color: #5e5e5e;
background: -moz-linear-gradient(top, #757575 0, #5e5e5e 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #757575), color-stop(100%, #5e5e5e));
- color: #ffffff;
- margin:0;
- font-size:12px;
- padding:5px 12px;
- text-decoration:none;
- text-shadow: #343434 0px -1px;
- border-width:1px 0 1px 1px;
- cursor:pointer;
+ color: #ffffff;
+ margin:0;
+ font-size:12px;
+ padding:5px 12px;
+ text-decoration:none;
+ text-shadow: #343434 0px -1px;
+ border-width:1px 0 1px 1px;
+ cursor:pointer;
}
.toggle-button:hover {
- background-color: #292929;
+ background-color: #292929;
background: -moz-linear-gradient(top, #3b3b3b 0, #292929 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3b3b3b), color-stop(100%, #292929));
- text-shadow: #000000 0px -1px;
+ text-shadow: #000000 0px -1px;
}
.toggle-button-active {
- background-color: #c6c6c6;
+ background-color: #c6c6c6;
background: -moz-linear-gradient(top, #767676 0, #c6c6c6 20%, #c6c6c6 35%, #a0a0a0 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #767676), color-stop(20%, #c6c6c6), color-stop(35%, #c6c6c6), color-stop(100%, #a0a0a0));
- color: #2e2e2e;
- cursor:default;
- text-shadow: #d8d8d8 0px 1px;
+ color: #2e2e2e;
+ cursor:default;
+ text-shadow: #d8d8d8 0px 1px;
}
.end-button {
- border-width:1px;
+ border-width:1px;
}
.button-bar-top .toggle-button, .button-bar-top .toggle-button-active {
- float:right;
+ float:right;
}
.button-bar-top .input_text {
- height:25px;
- margin-right:6px;
- padding: 0 3px;
+ height:25px;
+ margin-right:6px;
+ padding: 0 3px;
}
.button-bar-top .input_text.hasDatepicker, .input_text.hasDatepicker {
- background-image:url(images/input_with_calendar_bg.png);
- background-repeat:no-repeat;
- background-position:right 0;
+ background-image:url(images/input_with_calendar_bg.png);
+ background-repeat:no-repeat;
+ background-position:right 0;
}
.input_text.hasTimepicker {
- background-image:url(images/input_with_time_bg.png);
- background-repeat:no-repeat;
- background-position:right 0;
+ background-image:url(images/input_with_time_bg.png);
+ background-repeat:no-repeat;
+ background-position:right 0;
}
ul.errors {
- display:block;
- clear:left;
- padding:3px 0 0 0;
- margin:0;
+ display:block;
+ clear:left;
+ padding:3px 0 0 0;
+ margin:0;
}
.formrow-repeat ul.errors {
- width:278px;
+ width:278px;
}
ul.errors li {
- color:#902d2d;
- font-size:11px;
- padding:2px 4px;
- background:#c6b4b4;
- margin-bottom:2px;
- border:1px solid #c83f3f;
- list-style: none;
+ color:#902d2d;
+ font-size:11px;
+ padding:2px 4px;
+ background:#c6b4b4;
+ margin-bottom:2px;
+ border:1px solid #c83f3f;
+ list-style: none;
}
div.success{
- color:#3B5323;
- font-size:11px;
- padding:2px 4px;
- background:#93DB70;
- margin-bottom:2px;
- border:1px solid #488214;
+ color:#3B5323;
+ font-size:11px;
+ padding:2px 4px;
+ background:#93DB70;
+ margin-bottom:2px;
+ border:1px solid #488214;
}
div.errors, span.errors{
- color:#902d2d;
- font-size:11px;
+ color:#902d2d;
+ font-size:11px;
padding:2px 4px;
background:#c6b4b4;
margin-bottom:2px;
@@ -1701,38 +1708,38 @@ div.errors, span.errors{
span.errors.sp-errors{
width: 429px;
- display: block;
+ display: block;
}
.collapsible-header, .collapsible-header-disabled {
- border: 1px solid #8f8f8f;
- background-color: #cccccc;
+ border: 1px solid #8f8f8f;
+ background-color: #cccccc;
background: -moz-linear-gradient(top, #cccccc 0, #b9b9b9 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #cccccc), color-stop(100%, #b9b9b9));
- font-size:13px;
- color:#353535;
- font-weight:bold;
- padding:6px 0 6px 20px;
- margin:8px 0 0 0;
- cursor:pointer;
- position:relative;
+ font-size:13px;
+ color:#353535;
+ font-weight:bold;
+ padding:6px 0 6px 20px;
+ margin:8px 0 0 0;
+ cursor:pointer;
+ position:relative;
}
.collapsible-content {
- margin-top:-1px;
- display:none;
+ margin-top:-1px;
+ display:none;
}
.collapsible-header .arrow-icon, .collapsible-header-disabled .arrow-icon {
- display:block;
- background:url(images/arrows_collapse.png) no-repeat 0 0;
- height:11px;
- width:11px;
- position:absolute;
- left:5px;
- top:8px;
+ display:block;
+ background:url(images/arrows_collapse.png) no-repeat 0 0;
+ height:11px;
+ width:11px;
+ position:absolute;
+ left:5px;
+ top:8px;
}
.collapsible-header.closed .arrow-icon, collapsible-header-disabled.close .arrow-icon {
- background-position: 0 -11px !important;
+ background-position: 0 -11px !important;
}
#schedule-add-show .button-bar {
@@ -1743,44 +1750,44 @@ span.errors.sp-errors{
margin: 16px 0 0;
}
.schedule {
- text-align:left;
- height:38px;
+ text-align:left;
+ height:38px;
}
.add-button, .ui-widget-content a.add-button {
- border: 1px solid #242424;
- background-color: #353535;
+ border: 1px solid #242424;
+ background-color: #353535;
background: -moz-linear-gradient(top, #494949 0, #353535 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #494949), color-stop(100%, #353535));
- color: #ffffff;
- margin:0;
- font-size:12px;
- font-weight:bold;
- padding:4px 12px 4px 22px;
- text-decoration:none;
- text-shadow: #000 0px -1px;
- display:block;
- float:left;
- position:relative;
+ color: #ffffff;
+ margin:0;
+ font-size:12px;
+ font-weight:bold;
+ padding:4px 12px 4px 22px;
+ text-decoration:none;
+ text-shadow: #000 0px -1px;
+ display:block;
+ float:left;
+ position:relative;
}
.add-button:hover, .ui-widget-content a.add-button:hover {
- border: 1px solid #000000;
- background-color: #353535;
+ border: 1px solid #000000;
+ background-color: #353535;
background: -moz-linear-gradient(top, #353535 0, #000000 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #353535), color-stop(100%, #000000));
- color: #ffffff;
+ color: #ffffff;
}
.add-button span {
- position:absolute;
- top:3px;
- left:3px;
- height:16px;
- width:16px;
- display:block;
- background:url(redmond/images/ui-icons_ffffff_256x240.png) no-repeat;
+ position:absolute;
+ top:3px;
+ left:3px;
+ height:16px;
+ width:16px;
+ display:block;
+ background:url(redmond/images/ui-icons_ffffff_256x240.png) no-repeat;
}
.add-button:hover span {
- background:url(redmond/images/ui-icons_ff5d1a_256x240.png) no-repeat;
+ background:url(redmond/images/ui-icons_ff5d1a_256x240.png) no-repeat;
}
.add-button span.add-icon {
background-position: -32px -128px;
@@ -1788,20 +1795,20 @@ span.errors.sp-errors{
/*---//////////////////// NOW PLAYING COLORS ////////////////////---*/
.playing-song, .datatable tr.playing-song:hover td {
- background-color:#ff753c !important;
+ background-color:#ff753c !important;
}
.playing-list {
- background-color:#b0dcf2;
+ background-color:#b0dcf2;
}
.odd.playing-list {
- background-color:#bfe5f8;
+ background-color:#bfe5f8;
}
.gap, .datatable tr.gap:hover td {
- background-color:#da5454 !important;
+ background-color:#da5454 !important;
}
.group, tr td.group {
- background-color:#0aa2be;
- color:#FFF;
+ background-color:#0aa2be;
+ color:#FFF;
}
@@ -1810,10 +1817,10 @@ span.errors.sp-errors{
color: #646464;
position: relative;
text-decoration: none;
- padding: 0 0 0 20px;
+ padding: 0 0 0 20px;
}
.icon-link .ui-icon {
- background-image:url(redmond/images/ui-icons_666666_256x240.png);
+ background-image:url(redmond/images/ui-icons_666666_256x240.png);
background-repeat: no-repeat;
display: block;
height: 16px;
@@ -1826,107 +1833,107 @@ span.errors.sp-errors{
}
.icon-link:hover, .ui-widget-content a.icon-link:hover {
color: #444444;
- text-decoration:underline;
+ text-decoration:underline;
}
.icon-link:hover .ui-icon {
- background-image:url(redmond/images/ui-icons_454545_256x240.png);
+ background-image:url(redmond/images/ui-icons_454545_256x240.png);
}
.button-bar .icon-link {
- float:left;
- margin:7px 0 0 1px;
+ float:left;
+ margin:7px 0 0 1px;
}
#show_content_dialog .datatable tr:first-child td {
- border-top:none;
+ border-top:none;
}
#show_content_dialog .datatable {
- margin-top:8px;
+ margin-top:8px;
}
.simple-formblock.metadata, #side_playlist .simple-formblock.metadata {
- border:none;
- width:auto;
- display:block;
- padding: 2px;
+ border:none;
+ width:auto;
+ display:block;
+ padding: 2px;
}
#side_playlist .simple-formblock.metadata .input_text, #side_playlist .simple-formblock.metadata .input_text_area {
- width:95%;
+ width:95%;
}
#side_playlist .simple-formblock.metadata.simple-formblock dd {
- width:70%;
+ width:70%;
}
#side_playlist h3.plain {
- float:none;
- font-size:18px;
- margin:2px 0 20px 0;
+ float:none;
+ font-size:18px;
+ margin:2px 0 20px 0;
}
.qtip {
- font-size:11px;
- line-height:160%;
+ font-size:11px;
+ line-height:160%;
}
#schedule-show-who.scrolled {
margin-bottom: 0;
- max-height:300px;
- overflow:auto;
+ max-height:300px;
+ overflow:auto;
}
.text-content {
- padding:20px 10px 40px 58px;
- background: url(images/sf_arror.png) no-repeat 60% 0;
- min-height: 300px;
+ padding:20px 10px 40px 58px;
+ background: url(images/sf_arror.png) no-repeat 60% 0;
+ min-height: 300px;
}
.text-content h2 {
- font-size:2.4em;
- color:#1f1f1f;
+ font-size:2.4em;
+ color:#1f1f1f;
}
.text-content p {
- font-size:1.6em;
- line-height:140%;
- color:#1f1f1f;
- margin:0 0 1.4em 0;
+ font-size:1.6em;
+ line-height:140%;
+ color:#1f1f1f;
+ margin:0 0 1.4em 0;
}
.text-content a {
- color:#f2f2f2;
- text-decoration:none;
+ color:#f2f2f2;
+ text-decoration:none;
}
.text-content a:hover {
- text-decoration:underline;
+ text-decoration:underline;
}
.text-content ol {
- margin:0 0 22px 25px;
- padding:0;
- list-style-position:outside;
+ margin:0 0 22px 25px;
+ padding:0;
+ list-style-position:outside;
}
.text-content ol li {
- margin:0 0 6px 0;
- font-size:1.7em;
- display:list-item;
- color:#1f1f1f;
+ margin:0 0 6px 0;
+ font-size:1.7em;
+ display:list-item;
+ color:#1f1f1f;
}
.gray-logo {
- margin:5px 0 0 20px;
+ margin:5px 0 0 20px;
}
.formrow-repeat {
- list-style-type:none;
- margin:0;
- padding:0;
+ list-style-type:none;
+ margin:0;
+ padding:0;
}
.formrow-repeat li {
- list-style-type:none;
- margin:0 0 8px 0;
- padding:0;
- display:block;
+ list-style-type:none;
+ margin:0 0 8px 0;
+ padding:0;
+ display:block;
}
/*
.formrow-repeat li .ui-button-icon-only {
- width:1.8em;
+ width:1.8em;
}
.formrow-repeat li .ui-button-icon-only .ui-button-text, .formrow-repeat li .ui-button-icons-only .ui-button-text {
- padding: 3px 3px 4px;
+ padding: 3px 3px 4px;
}
.formrow-repeat li .ui-button-icon-only .ui-icon {
@@ -1951,7 +1958,7 @@ span.errors.sp-errors{
#add_show_rebroadcast_absolute .ui-button-icons-only .ui-button-text,
#add_show_rebroadcast_relative .ui-button-text-icon-primary .ui-button-text,
#add_show_rebroadcast_absolute .ui-button-text-icon-primary .ui-button-text {
- font-size:12px;
+ font-size:12px;
}
#add_show_rebroadcast_relative .ui-button-icon-only .ui-icon,
@@ -1972,60 +1979,60 @@ span.errors.sp-errors{
.formrow-repeat li .inline-text {
color: #666666;
- padding: 0 6px 0 0;
+ padding: 0 6px 0 0;
}
.formrow-repeat li .input_text, .formrow-repeat li .input_select {
- margin-right:6px;
+ margin-right:6px;
}
.formrow-repeat li .hasDatepicker, .formrow-repeat li .input_select {
- width:95px;
+ width:95px;
}
.formrow-repeat li .hasTimepicker {
- width:60px;
+ width:60px;
}
.recording-show {
- float: right;
- background:url(images/record_icon.png) no-repeat 0 0;
- width:23px;
- height:23px;
+ float: right;
+ background:url(images/record_icon.png) no-repeat 0 0;
+ width:23px;
+ height:23px;
}
.datatable td .info-icon {
- margin:-4px 3px -3px 0;
- float:right;
+ margin:-4px 3px -3px 0;
+ float:right;
}
.time-flow {
- float:right;
- margin-right:4px;
+ float:right;
+ margin-right:4px;
}
.small-icon {
- display:block;
- width:20px;
- height:10px;
- float:right;
- margin-left:3px;
- margin-top:2px;
+ display:block;
+ width:20px;
+ height:10px;
+ float:right;
+ margin-left:3px;
+ margin-top:2px;
}
.small-icon.linked {
background:url(images/icon_link.png) no-repeat 0 0;
margin-top: 0px !important;
}
.small-icon.recording {
- background:url(images/icon_record.png) no-repeat 0 0;
+ background:url(images/icon_record.png) no-repeat 0 0;
margin-top: 0px !important;
}
.small-icon.rebroadcast {
- background:url(images/icon_rebroadcast.png) no-repeat 0 0;
+ background:url(images/icon_rebroadcast.png) no-repeat 0 0;
margin-top: 0px !important;
}
.small-icon.soundcloud {
- background:url(images/icon_soundcloud.png) no-repeat 0 0;
- width:21px;
+ background:url(images/icon_soundcloud.png) no-repeat 0 0;
+ width:21px;
margin-top: 0px !important;
}
.small-icon.sc-error {
- background:url(images/icon_soundcloud_error2.png) no-repeat 0 0;
- width:21px;
+ background:url(images/icon_soundcloud_error2.png) no-repeat 0 0;
+ width:21px;
margin-top: 0px !important;
}
.small-icon.now-playing {
@@ -2033,20 +2040,20 @@ span.errors.sp-errors{
height:10px;
}
.small-icon.progress {
- background:url(images/upload-icon.gif) no-repeat;
+ background:url(images/upload-icon.gif) no-repeat;
background-color:black;
background-position:center;
- border-radius:2px;
- -webkit-border-radius:2px;
- -moz-border-radius:2px;
+ border-radius:2px;
+ -webkit-border-radius:2px;
+ -moz-border-radius:2px;
margin-top: 0px !important;
}
.small-icon.alert {
- background:url(images/icon_alert.png) no-repeat;
- float:left;
- width:13px;
- margin-right:3px;
- margin-left:1px;
+ background:url(images/icon_alert.png) no-repeat;
+ float:left;
+ width:13px;
+ margin-right:3px;
+ margin-left:1px;
}
.small-icon.show-empty {
background:url(images/icon_alert_cal_alt.png) no-repeat 0 0;
@@ -2063,33 +2070,33 @@ span.errors.sp-errors{
height: 16px !important;
}
.medium-icon {
- display:block;
- width:25px;
- height:12px;
- float:right;
- margin-left:4px;
+ display:block;
+ width:25px;
+ height:12px;
+ float:right;
+ margin-left:4px;
}
.medium-icon.recording {
- background:url(images/icon_record_m.png) no-repeat 0 0;
- width:20px;
+ background:url(images/icon_record_m.png) no-repeat 0 0;
+ width:20px;
}
.medium-icon.rebroadcast {
- background:url(images/icon_rebroadcast_m.png) no-repeat 0 0;
+ background:url(images/icon_rebroadcast_m.png) no-repeat 0 0;
}
.medium-icon.soundcloud {
- background:url(images/icon_soundcloud_m.png) no-repeat 0 0;
- width:21px;
+ background:url(images/icon_soundcloud_m.png) no-repeat 0 0;
+ width:21px;
}
.medium-icon.nowplaying, .medium-icon.finishedplaying {
- background:url(images/icon_nowplaying_m.png) no-repeat 0 0;
- width:12px;
- height:9px;
- float:left;
- margin-left:6px;
- margin-right:0;
+ background:url(images/icon_nowplaying_m.png) no-repeat 0 0;
+ width:12px;
+ height:9px;
+ float:left;
+ margin-left:6px;
+ margin-right:0;
}
.medium-icon.finishedplaying {
- background:url(images/icon_finishedplaying_m.png) no-repeat 0 0;
+ background:url(images/icon_finishedplaying_m.png) no-repeat 0 0;
}
.preferences {
width: 500px;
@@ -2116,26 +2123,26 @@ dt.block-display, dd.block-display {
padding: 0 0 5px 0;
}
.preferences dd.block-display, .stream-config dd.block-display {
- margin-bottom:4px;
+ margin-bottom:4px;
}
.preferences dd.block-display:last-child, .stream-config dd.block-display:last-child {
- margin-bottom:0;
- padding-bottom:0;
+ margin-bottom:0;
+ padding-bottom:0;
}
.preferences input[type="radio"], .stream-config input[type="radio"] {
- margin:0;
+ margin:0;
}
.preferences label input[type="radio"], .stream-config label input[type="radio"] {
- margin:0 1px 0 0;
+ margin:0 1px 0 0;
}
.preferences label input[type="checkbox"], .stream-config label input[type="checkbox"] {
- margin:0 5px 0 0;
+ margin:0 5px 0 0;
}
dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio-inline-list {
- margin-bottom:6px;
+ margin-bottom:6px;
}
.radio-inline-list label {
- margin-right:12px;
+ margin-right:12px;
}
.preferences.simple-formblock dd.block-display {
width: 100%;
@@ -2158,14 +2165,14 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
}
#show_time_info {
- font-size:12px;
- height:30px;
+ font-size:12px;
+ height:30px;
}
#show_time_warning {
- background:#c83f3f url(images/icon_alert_ffffff.png) no-repeat 5px 4px;
- border:1px solid #9d1010;
- color:#fff;
- padding: 2px 5px 2px 24px;
+ background:#c83f3f url(images/icon_alert_ffffff.png) no-repeat 5px 4px;
+ border:1px solid #9d1010;
+ color:#fff;
+ padding: 2px 5px 2px 24px;
font-size: 12px;
line-height: 140%;
}
@@ -2178,84 +2185,84 @@ button.ui-button.md-cancel {
/*--//////////////////////// Changes/add-ons Jun 8th, 2011 ////////////////////////--*/
.dialogPopup.ui-dialog-content {
- padding: 0.9em 1em;
+ padding: 0.9em 1em;
}
.dialogPopup dl {
- margin:0;
- padding:0;
- clear:both;
- width:100%;
+ margin:0;
+ padding:0;
+ clear:both;
+ width:100%;
}
.dialogPopup dt {
- clear: left;
- padding: 0;
- float:left;
- width:35%;
+ clear: left;
+ padding: 0;
+ float:left;
+ width:35%;
}
.dialogPopup dt.block-display {
- float:none;
- width:100%;
- padding: 0 0 10px;
+ float:none;
+ width:100%;
+ padding: 0 0 10px;
}
.dialogPopup dt label {
- font-weight: bold;
- line-height:24px;
+ font-weight: bold;
+ line-height:24px;
}
.dialogPopup dd {
- padding: 0;
- float:left;
- width:65%;
- margin:0 0 6px 0;
+ padding: 0;
+ float:left;
+ width:65%;
+ margin:0 0 6px 0;
}
.dialogPopup dd.block-display {
- float:none;
- width:100%;
- padding: 0 0 10px;
- margin:0 0 8px 0;
+ float:none;
+ width:100%;
+ padding: 0 0 10px;
+ margin:0 0 8px 0;
}
.dialogPopup fieldset dt:last-child, .dialogPopup fieldset dd:last-child {
- margin:0;
+ margin:0;
}
.info-text {
- font-size:12px;
- color:#5b5b5b;
- line-height:150%;
- padding:0 0 6px;
- margin:0;
+ font-size:12px;
+ color:#5b5b5b;
+ line-height:150%;
+ padding:0 0 6px;
+ margin:0;
}
.dialogPopup label input[type="checkbox"] {
- float:left;
- margin-right:6px;
+ float:left;
+ margin-right:6px;
}
.dialogPopup fieldset {
- padding: 0;
- clear:both;
- border:none;
+ padding: 0;
+ clear:both;
+ border:none;
}
.dialogPopup fieldset dd input[type="text"], .dialogPopup fieldset dd textarea {
- width:99.5%;
- padding:0;
+ width:99.5%;
+ padding:0;
}
.dialogPopup fieldset dd input[type="text"] {
- height:23px;
+ height:23px;
}
.dialogPopup fieldset dd select {
- width:100%;
+ width:100%;
}
fieldset.display_field {
- /*background-color:#d5d5d5;
- box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;*/
- padding:10px;
- border: 1px solid #8F8F8F;
+ /*background-color:#d5d5d5;
+ box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;*/
+ padding:10px;
+ border: 1px solid #8F8F8F;
}
label span {
- font-weight:normal;
+ font-weight:normal;
}
.dialogPopup .display_field dt, .dialogPopup .display_field dd {
@@ -2265,32 +2272,32 @@ label span {
margin: 0;
padding: 4px 0;
text-align: left;
- width:auto;
+ width:auto;
}
.dialogPopup .display_field dt {
clear: left;
- font-weight:bold;
- width:auto;
- min-width:auto;
- padding-right:8px;
+ font-weight:bold;
+ width:auto;
+ min-width:auto;
+ padding-right:8px;
}
#show_what_sending textarea {
background-color:transparent;
- border:none;
+ border:none;
box-shadow: none;
font-size: 12px;
text-indent: 0;
- margin:0;
- width:99%;
- line-height:180%;
- resize: none;
+ margin:0;
+ width:99%;
+ line-height:180%;
+ resize: none;
}
#show_what_sending textarea:focus {
- border:none;
+ border:none;
}
#show_what_sending dl {
- overflow-x: hidden;
+ overflow-x: hidden;
}
#watched-folder-section dd.block-display input[type="text"] {
@@ -2298,19 +2305,19 @@ label span {
}
#watched-folder-section dd.block-display input[type="button"] {
- border: 1px solid #5b5b5b;
- background-color: #6e6e6e;
+ border: 1px solid #5b5b5b;
+ background-color: #6e6e6e;
background: -moz-linear-gradient(top, #868686 0, #6e6e6e 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #868686), color-stop(100%, #6e6e6e));
- color: #ffffff;
- font-family:Arial, Helvetica, sans-serif;
- font-size:12px;
- height:25px;
- margin:0;
- display:block;
- margin-left:5px;
- line-height:12px;
- padding:0 10px 1px 10px;
+ color: #ffffff;
+ font-family:Arial, Helvetica, sans-serif;
+ font-size:12px;
+ height:25px;
+ margin:0;
+ display:block;
+ margin-left:5px;
+ line-height:12px;
+ padding:0 10px 1px 10px;
}
#watched-folder-section a {
@@ -2324,53 +2331,53 @@ label span {
}
#watched-folder-section dd.block-display input[type="button"]:hover {
- border: 1px solid #242424;
- background-color: #292929;
+ border: 1px solid #242424;
+ background-color: #292929;
background: -moz-linear-gradient(top, #3b3b3b 0, #292929 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3b3b3b), color-stop(100%, #292929));
- color: #ffffff;
+ color: #ffffff;
}
#watched-folder-section dd.block-display {
- clear:both;
- min-height:25px;
-
+ clear:both;
+ min-height:25px;
+
}
#watched-folder-section dd.block-display.selected-item {
- clear:both;
- background:#9a9a9a;
- margin:2px 0 5px 0;
- width:84%;
- padding:4px 8px 0;
- position:relative;
- min-height:22px;
- border-radius: 4px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- font-size:13px;
+ clear:both;
+ background:#9a9a9a;
+ margin:2px 0 5px 0;
+ width:84%;
+ padding:4px 8px 0;
+ position:relative;
+ min-height:22px;
+ border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ font-size:13px;
}
#watched-folder-section dd.block-display.selected-item .ui-icon {
- position:absolute;
- top:4px;
- right:5px;
- cursor:pointer;
+ position:absolute;
+ top:4px;
+ right:5px;
+ cursor:pointer;
}
#watched-folder-section dd.block-display.selected-item .ui-icon.ui-icon-refresh {
- position:absolute;
- top:4px;
- right:20px;
- cursor:pointer;
- background-image:url(redmond/images/ui-icons_ffffff_256x240.png);
- background-position: -128px -63px;
+ position:absolute;
+ top:4px;
+ right:20px;
+ cursor:pointer;
+ background-image:url(redmond/images/ui-icons_ffffff_256x240.png);
+ background-position: -128px -63px;
}
#watched-folder-section dd.block-display.selected-item .ui-icon:hover {
- background-image:url(redmond/images/ui-icons_ff5d1a_256x240.png)
+ background-image:url(redmond/images/ui-icons_ff5d1a_256x240.png)
}
#watched-folder-section dd.block-display input {
- float:left;
+ float:left;
}
fieldset > legend {
@@ -2389,7 +2396,7 @@ fieldset.sb-criteria-fieldset{
}
fieldset.closed dl, fieldset.closed textarea, fieldset.closed div, fieldset.closed h2 {
- display:none;
+ display:none;
}
fieldset legend .ui-icon, .ui-widget-content fieldset legend .ui-icon {
@@ -2398,31 +2405,31 @@ fieldset legend .ui-icon, .ui-widget-content fieldset legend .ui-icon {
}
input[type="checkbox"][disabled] {
- opacity: 0.6;
+ opacity: 0.6;
}
.play_small {
- height:11px;
- width: 15px;
- display:inline-block;
- background:url(images/play_pause_small.png) no-repeat 0 0;
- margin:0 7px 0 0;
- text-indent:-9999px;
- overflow:hidden;
- line-height:10px;
+ height:11px;
+ width: 15px;
+ display:inline-block;
+ background:url(images/play_pause_small.png) no-repeat 0 0;
+ margin:0 7px 0 0;
+ text-indent:-9999px;
+ overflow:hidden;
+ line-height:10px;
}
.play_small:hover, .play_small.paused {
- background-position: 0 -11px;
+ background-position: 0 -11px;
}
.play_small.paused:hover {
- background-position: 0 -22px;
+ background-position: 0 -22px;
}
.play_small.playing {
- background-position: -20px 0;
+ background-position: -20px 0;
}
.play_small.playing:hover {
- background-position: -20px -11px;
+ background-position: -20px -11px;
}
.info-text-small {
@@ -2431,42 +2438,42 @@ input[type="checkbox"][disabled] {
line-height: 150%;
margin: 0;
padding: 0 0 6px;
- font-style:italic;
- font-weight:normal;
+ font-style:italic;
+ font-weight:normal;
}
dd .info-text-small {
padding: 1px 0 2px;
- display:inline-block;
+ display:inline-block;
}
.stream-config dt {
- width:120px;
- padding: 4px 0;
+ width:120px;
+ padding: 4px 0;
}
.stream-config dt.block-display {
- width:auto;
+ width:auto;
}
.stream-config dd {
- margin-bottom:0px;
+ margin-bottom:0px;
}
.stream-config dd select {
- width:180px;
- line-height:140%;
+ width:180px;
+ line-height:140%;
}
.stream-config input[type="text"], .stream-config input[type="password"] {
/*width:98.5%;*/
- min-width:172px;
+ min-width:172px;
}
.stream-config .display_field dd input[type="text"], .stream-config .display_field dd input[type="password"], .stream-config .display_field dd textarea {
- min-width:99%;
- padding: 4px 3px;
+ min-width:99%;
+ padding: 4px 3px;
}
.stream-config .display_field dd textarea {
- min-height:60px;
+ min-height:60px;
}
.simple-formblock .display_field dd {
- min-width:68%;
+ min-width:68%;
}
.stream-config dd input[id$=port] {
width:152px;
@@ -2474,25 +2481,25 @@ dd .info-text-small {
dt.block-display.info-block {
width: auto;
- font-size:12px;
- padding:10px 0;
+ font-size:12px;
+ padding:10px 0;
}
.top-margin {
- margin-top:10px;
- float: left;
+ margin-top:10px;
+ float: left;
}
.left-margin {
- margin-left:20px;
- float: left;
+ margin-left:20px;
+ float: left;
}
.stream-config dd.block-display textarea {
width: 99.5%;
- height: 110px;
+ height: 110px;
}
-
+
.input-info {
- font-size:12px;
- padding:0 0 0 5px;
+ font-size:12px;
+ padding:0 0 0 5px;
}
.stream-config dd.block-display input[type="text"].with-info, .stream-config dd.block-display input[type="password"].with-info {
@@ -2500,28 +2507,28 @@ dt.block-display.info-block {
}
.stream-config dd.block-display p {
font-size:13px;
- margin:4px 0 4px 2px;
+ margin:4px 0 4px 2px;
}
.stream-config #output_setting {
- width: 96%;
+ width: 96%;
}
.stream-config dt.block-display, .stream-config dd.block-display {
- /*float: left;*/
+ /*float: left;*/
}
.collapsible-header-disabled {
- cursor:default;
- opacity:0.6;
+ cursor:default;
+ opacity:0.6;
}
/*---//////////////////// ERROR PAGE ////////////////////---*/
-.error-content {
- background:url(images/404.png) no-repeat 0 0;
- width:300px;
- margin: 24px 15px;
- padding: 0px 10px 0 420px;
+.error-content {
+ background:url(images/404.png) no-repeat 0 0;
+ width:300px;
+ margin: 24px 15px;
+ padding: 0px 10px 0 420px;
}
.error-content h2 {
margin:0;
@@ -2530,9 +2537,9 @@ dt.block-display.info-block {
font-weight:bold;
color:#3e3e3e;
text-align:left;
- letter-spacing:-.3px;
- text-shadow: rgba(248,248,248,.3) 0 1px 0, rgba(0,0,0,.8) 0 -1px 0;
- rgba(51,51,51,.9)
+ letter-spacing:-.3px;
+ text-shadow: rgba(248,248,248,.3) 0 1px 0, rgba(0,0,0,.8) 0 -1px 0;
+ rgba(51,51,51,.9)
}
.error-content p {
color: #272727;
@@ -2540,37 +2547,37 @@ dt.block-display.info-block {
margin: 0;
padding:8px 2px;
}
-.error-content .button-bar {
- margin-top:47px;
- padding-left:2px;
+.error-content .button-bar {
+ margin-top:47px;
+ padding-left:2px;
}
-.error-content .toggle-button {
- border: 1px solid #434343;
- border-width:1px 1px 0px 1px;
- background-color: #636363;
+.error-content .toggle-button {
+ border: 1px solid #434343;
+ border-width:1px 1px 0px 1px;
+ background-color: #636363;
background: -moz-linear-gradient(top, #737373 0, #545454 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #737373), color-stop(100%, #545454));
- color: #1b1b1b;
- font-size:15px;
- font-weight:bold;
- padding:5px 14px 6px 15px;
- text-shadow: rgba(248,248,248,.24) 0 1px 0;
- box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset;
- -moz-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset;
- -webkit-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset;
- margin: 0 5px 0 0;
+ color: #1b1b1b;
+ font-size:15px;
+ font-weight:bold;
+ padding:5px 14px 6px 15px;
+ text-shadow: rgba(248,248,248,.24) 0 1px 0;
+ box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset;
+ -moz-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset;
+ -webkit-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset;
+ margin: 0 5px 0 0;
}
-.error-content .toggle-button:hover {
- border: 1px solid #000;
- border-width:1px 1px 0px 1px;
- background-color: #353535;
+.error-content .toggle-button:hover {
+ border: 1px solid #000;
+ border-width:1px 1px 0px 1px;
+ background-color: #353535;
background: -moz-linear-gradient(top, #393939 0, #000000 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #393939), color-stop(100%, #000000));
- color: #ff5d1a;
- text-shadow:none;
- box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.6) 0 2px 2px inset;
- -moz-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.6) 0 2px 2px inset;
- -webkit-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.6) 0 2px 2px inset;
+ color: #ff5d1a;
+ text-shadow:none;
+ box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.6) 0 2px 2px inset;
+ -moz-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.6) 0 2px 2px inset;
+ -webkit-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.6) 0 2px 2px inset;
}
/*---//////////////////// DEFAULT TABLE ////////////////////---*/
@@ -2580,40 +2587,40 @@ table {
border-style: solid;
border-width: 0;
}
-tbody tr th {
- color: #000000;
- background-color: #b1b1b1;
+tbody tr th {
+ color: #000000;
+ background-color: #b1b1b1;
background: -moz-linear-gradient(top, #bebebe 0, #a2a2a2 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #bebebe), color-stop(100%, #a2a2a2));
- font-size: 13px;
+ font-size: 13px;
padding: 5px 5px;
border-color: #b1b1b1;
border-style: solid;
border-width: 1px 0 0 1px;
- border-top-color: #5b5b5b;
- text-align:left;
+ border-top-color: #5b5b5b;
+ text-align:left;
}
-thead tr th {
- color: #FFFFFF;
+thead tr th {
+ color: #FFFFFF;
font-size: 12px;
padding: 5px 5px;
- border-color:#CCCCCC;
- background-color: #6e6e6e;
+ border-color:#CCCCCC;
+ background-color: #6e6e6e;
background: -moz-linear-gradient(top, #868686 0, #6e6e6e 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #868686), color-stop(100%, #6e6e6e));
border-style: solid;
border-width: 0 0 0 1px;
}
-tr td {
+tr td {
border-color: #b1b1b1;
border-style: solid;
border-width: 0;
font-size: 12px;
padding: 5px 5px;
}
-tfoot tr td, tfoot tr th {
- color:#FFFFFF;
- background-color: #6e6e6e;
+tfoot tr td, tfoot tr th {
+ color:#FFFFFF;
+ background-color: #6e6e6e;
background: -moz-linear-gradient(top, #6e6e6e 0, #868686 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #6e6e6e), color-stop(100%, #868686));
font-size: 13px;
@@ -2622,215 +2629,215 @@ tfoot tr td, tfoot tr th {
border-style: solid;
border-width: 1px 0 0 1px;
}
-tfoot tr th {
- font-weight:bold;
- text-align:left;
+tfoot tr th {
+ font-weight:bold;
+ text-align:left;
}
-
-
+
+
/*---//////////////////// STATUS TABLE ////////////////////---*/
-.statustable {
- background-color: #D8D8D8;
+.statustable {
+ background-color: #D8D8D8;
border-width: 2px 1px 1px;
}
-.statustable tr td, .statustable tr th {
- text-align:center;
- vertical-align:text-top;
- font-size:13px;
+.statustable tr td, .statustable tr th {
+ text-align:center;
+ vertical-align:text-top;
+ font-size:13px;
}
-.statustable tr td {
- border-width: 1px 0 0 1px;
+.statustable tr td {
+ border-width: 1px 0 0 1px;
}
.statustable tr td:first-child, .statustable tr th:first-child {
- text-align:left;
+ text-align:left;
border-left-width: 0 !important;
}
-.checked-icon {
- width:100%;
- margin:0;
- background: url("images/accept.png") no-repeat center center;
- height:16px;
- margin:0;
- display:block;
+.checked-icon {
+ width:100%;
+ margin:0;
+ background: url("images/accept.png") no-repeat center center;
+ height:16px;
+ margin:0;
+ display:block;
}
-.not-available-icon {
- width:100%;
- margin:0;
- background: url("images/delete.png") no-repeat center center;
- height:16px;
- margin:0;
- display:block;
+.not-available-icon {
+ width:100%;
+ margin:0;
+ background: url("images/delete.png") no-repeat center center;
+ height:16px;
+ margin:0;
+ display:block;
}
-.warning-icon {
- width:100%;
- margin:0;
- background: url("images/warning-icon.png") no-repeat center center;
- height:16px;
- margin:0;
- display:block;
+.warning-icon {
+ width:100%;
+ margin:0;
+ background: url("images/warning-icon.png") no-repeat center center;
+ height:16px;
+ margin:0;
+ display:block;
}
-.statustable ul {
- margin:4px 0;
- padding:0;
- list-style-type: none;
+.statustable ul {
+ margin:4px 0;
+ padding:0;
+ list-style-type: none;
}
-.statustable ul li {
- background:#bbb;
- margin:2px 0 6px 0;
- padding:4px 8px 0;
- position:relative;
- min-height:22px;
- border-radius: 4px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- font-size:13px;
+.statustable ul li {
+ background:#bbb;
+ margin:2px 0 6px 0;
+ padding:4px 8px 0;
+ position:relative;
+ min-height:22px;
+ border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ font-size:13px;
}
-.statustable .big {
- width:120px;
- height:10px;
- background:#444444;
+.statustable .big {
+ width:120px;
+ height:10px;
+ background:#444444;
background: -moz-linear-gradient(top, #464646 0, #3e3e3e 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3e3e3e), color-stop(100%, #464646));
- border-bottom:1px solid #fff;
- margin: 0 auto;
- padding: 1px;
- display:inline-block;
+ border-bottom:1px solid #fff;
+ margin: 0 auto;
+ padding: 1px;
+ display:inline-block;
}
-.diskspace {
- background-color:#e76400;
+.diskspace {
+ background-color:#e76400;
background: -moz-linear-gradient(top, #ff6f01 0, #bc5200 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #ff6f01), color-stop(100%, #bc5200));
- height:10px;
+ height:10px;
}
-.statustable a {
- color: #222;
- text-decoration: underline;
+.statustable a {
+ color: #222;
+ text-decoration: underline;
}
-.statustable a:visited {
- color: #666;
- text-decoration: underline;
+.statustable a:visited {
+ color: #666;
+ text-decoration: underline;
}
-.statustable a:hover {
- color: #e76400;
- text-decoration: underline;
+.statustable a:hover {
+ color: #e76400;
+ text-decoration: underline;
}
-.strong {
- font-weight:bold;
+.strong {
+ font-weight:bold;
}
/*---//////////////////// PLUPLOAD ERROR ////////////////////---*/
#plupload_error{
- margin-top:10px;
+ margin-top:10px;
}
-#plupload_error table {
- color:red;
- border:1px solid #c83f3f;
- background:#c6b4b4;
- display:none;
+#plupload_error table {
+ color:red;
+ border:1px solid #c83f3f;
+ background:#c6b4b4;
+ display:none;
}
#plupload_error table td {
- color:#902d2d;
- font-size:12px;
- font-weight:bold;
- padding:2px 4px;
- margin-bottom:2px;
- border:none;
- margin:0;
+ color:#902d2d;
+ font-size:12px;
+ font-weight:bold;
+ padding:2px 4px;
+ margin-bottom:2px;
+ border:none;
+ margin:0;
}
/*---//////////////////// TRIAL BOX HEADER ////////////////////---*/
-.trial-box {
- width:142px;
- height:38px;
- display:block;
- position:fixed;
- left:20px;
- bottom:10px;
- background-color:#222;
- background-color:rgba(0, 0, 0, 0.7);
- z-index:100;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- color:#FFF;
- font-size:11px;
- padding:7px;
+.trial-box {
+ width:142px;
+ height:38px;
+ display:block;
+ position:fixed;
+ left:20px;
+ bottom:10px;
+ background-color:#222;
+ background-color:rgba(0, 0, 0, 0.7);
+ z-index:100;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ color:#FFF;
+ font-size:11px;
+ padding:7px;
}
-.trial-box p {
- padding:0 0 3px 0;
- margin:0 0 5px 0;
- float:left;
+.trial-box p {
+ padding:0 0 3px 0;
+ margin:0 0 5px 0;
+ float:left;
}
.trial-box-button a {
- width:92px;
- height:14px;
- display:block;
- padding: 1px 3px;
- -moz-border-radius: 1px;
- -webkit-border-radius: 1px;
- border-radius: 1px;
- text-transform:uppercase;
- text-align:center;
- font-family:Arial, Helvetica, sans-serif;
- font-weight:bold;
- text-decoration:none;
- color:#FFFFFF;
- background-color:#ff5d1a;
+ width:92px;
+ height:14px;
+ display:block;
+ padding: 1px 3px;
+ -moz-border-radius: 1px;
+ -webkit-border-radius: 1px;
+ border-radius: 1px;
+ text-transform:uppercase;
+ text-align:center;
+ font-family:Arial, Helvetica, sans-serif;
+ font-weight:bold;
+ text-decoration:none;
+ color:#FFFFFF;
+ background-color:#ff5d1a;
background: -moz-linear-gradient(top, #ff5d1a 0, #dd4202 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #ff5d1a), color-stop(100%, #dd4202));
- box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
- -moz-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
- -webkit-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
- float:left;
+ box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
+ -moz-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
+ -webkit-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
+ float:left;
}
.trial-box-button a:hover {
- background-color:#dd4202;
+ background-color:#dd4202;
background: -moz-linear-gradient(top, #dd4202 0, #ff5d1a 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #dd4202), color-stop(100%, #ff5d1a));
- box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
- -moz-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
- -webkit-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
+ box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
+ -moz-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
+ -webkit-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
}
-.trial-box-calendar {
- float:right;
- text-align:center;
- font-weight:bold;
+.trial-box-calendar {
+ float:right;
+ text-align:center;
+ font-weight:bold;
}
-.trial-box-calendar-white {
- font-size:18px;
- color:#ff5d1a;
- background:#FFF;
- width:36px;
- height:22px;
- display:block;
- -webkit-border-top-right-radius: 1px;
- -moz-border-radius-topright: 1px;
- -webkit-border-top-left-radius: 1px;
- -moz-border-radius-topleft: 1px;
+.trial-box-calendar-white {
+ font-size:18px;
+ color:#ff5d1a;
+ background:#FFF;
+ width:36px;
+ height:22px;
+ display:block;
+ -webkit-border-top-right-radius: 1px;
+ -moz-border-radius-topright: 1px;
+ -webkit-border-top-left-radius: 1px;
+ -moz-border-radius-topleft: 1px;
}
-.trial-box-calendar-gray {
- width:36px;
- height:14px;
- display:block;
- color:#FFF;
- font-size:11px;
- padding:1px 0;
- text-transform:uppercase;
- background-color:#676767;
+.trial-box-calendar-gray {
+ width:36px;
+ height:14px;
+ display:block;
+ color:#FFF;
+ font-size:11px;
+ padding:1px 0;
+ text-transform:uppercase;
+ background-color:#676767;
background: -moz-linear-gradient(top, #7f7f7f 0, #555555 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #7f7f7f), color-stop(100%, #555555));
- -webkit-border-bottom-right-radius: 1px;
- -moz-border-radius-bottomright: 1px;
- -webkit-border-bottom-left-radius: 1px;
- -moz-border-radius-bottomleft: 1px;
- box-shadow: rgba(0, 0, 0, 0.4) 0 2px 1px inset;
- -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset;
- -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset;
+ -webkit-border-bottom-right-radius: 1px;
+ -moz-border-radius-bottomright: 1px;
+ -webkit-border-bottom-left-radius: 1px;
+ -moz-border-radius-bottomleft: 1px;
+ box-shadow: rgba(0, 0, 0, 0.4) 0 2px 1px inset;
+ -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset;
+ -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset;
}
#stream_url {font-size:12px; line-height: 170%;}
.stream-setting-content fieldset {border-width:0 1px 1px 1px;}
@@ -2848,63 +2855,63 @@ tfoot tr th {
/*---//////////////////// STREAM SETTINGS STATUS ////////////////////---*/
.stream-status {
- border: 1px solid;
- padding:2px 10px 4px 22px;
- margin:2px 1px 10px 0px;
- width: auto;
+ border: 1px solid;
+ padding:2px 10px 4px 22px;
+ margin:2px 1px 10px 0px;
+ width: auto;
}
dd .stream-status {
- margin-bottom:1px;
+ margin-bottom:1px;
}
.stream-status h3 {
- font-size: 12px;
- font-weight: bold;
- line-height: 12px;
- padding:0;
- margin:5px 4px 2px 4px;
+ font-size: 12px;
+ font-weight: bold;
+ line-height: 12px;
+ padding:0;
+ margin:5px 4px 2px 4px;
}
.stream-status p {
- padding:0;
- margin:2px 3px 1px 4px;
- color:#4F4F4F;
- font-size: 11px;
+ padding:0;
+ margin:2px 3px 1px 4px;
+ color:#4F4F4F;
+ font-size: 11px;
}
-.stream-config dd.stream-status {
- padding:2px 10px 4px 22px;
- margin:4px 0 10px 14px;
- width: 65%;
+.stream-config dd.stream-status {
+ padding:2px 10px 4px 22px;
+ margin:4px 0 10px 14px;
+ width: 65%;
}
.status-good {
- background:#e3ffc9 url(images/stream_status.png) no-repeat 5px 5px;
- border-color:#54b300;
+ background:#e3ffc9 url(images/stream_status.png) no-repeat 5px 5px;
+ border-color:#54b300;
}
.status-good h3 {
- color:#54b300;
+ color:#54b300;
}
.status-error {
- background:#ffeded url(images/stream_status.png) no-repeat 5px -128px;
- border-color:#f90000;
+ background:#ffeded url(images/stream_status.png) no-repeat 5px -128px;
+ border-color:#f90000;
}
.status-error h3 {
- color:#DA0101;
+ color:#DA0101;
}
.status-info {
- background:#fff7e0 url(images/stream_status.png) no-repeat 5px -278px;
- border-color:#f68826;
+ background:#fff7e0 url(images/stream_status.png) no-repeat 5px -278px;
+ border-color:#f68826;
}
.status-info h3 {
- color:#f1830c;
+ color:#f1830c;
}
.status-disabled {
- background:#c8ccc8 url(images/stream_status.png) no-repeat 5px -429px;
- border-color:#7f827f;
+ background:#c8ccc8 url(images/stream_status.png) no-repeat 5px -429px;
+ border-color:#7f827f;
}
.status-disabled h3 {
- color:#646664;
+ color:#646664;
}
.stream-setting-global dt{
- width: 195px;
+ width: 195px;
}
.stream-setting-global dd{
@@ -2914,108 +2921,108 @@ dd .stream-status {
.qtip div > span {
padding: 5px;
}
-
+
.pull-left {
- float:left;
+ float:left;
}
.pull-right {
- float:right;
+ float:right;
}
.push-down-8 {
- margin-top:8px !important
+ margin-top:8px !important
}
.push-down-12 {
- margin-top:12px !important
+ margin-top:12px !important
}
.push-down-16 {
- margin-top:16px !important
+ margin-top:16px !important
}
.close-round {
- display:block;
- float:right;
- height:18px;
- width:18px;
- background:url(images/round_delete.png) no-repeat 0 0;
- text-indent: 100%;
- white-space: nowrap;
- overflow: hidden;
- margin: 3px 0 0 10px;
- }
+ display:block;
+ float:right;
+ height:18px;
+ width:18px;
+ background:url(images/round_delete.png) no-repeat 0 0;
+ text-indent: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ margin: 3px 0 0 10px;
+ }
.close-round:hover {
- background-position:0 -36px;
+ background-position:0 -36px;
}
.close-round:active {
- background-position:0 -36px;
+ background-position:0 -36px;
}
-/*---//////////////////// NEW BUTTONS ////////////////////
+/*---//////////////////// NEW BUTTONS ////////////////////
.btn {
- display: inline-block;
- *display: inline;
+ display: inline-block;
+ *display: inline;
-
- *zoom: 1;
- padding: 4px 10px 4px;
- margin-bottom: 0;
- font-size: 13px;
- line-height: 18px;
- color: #fff;
- text-align: center;
- vertical-align: middle;
- background-image: -moz-linear-gradient(top, #a3a3a3, #6e6e6e);
- background-image: -ms-linear-gradient(top, #a3a3a3, #6e6e6e);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#a3a3a3), to(#6e6e6e));
- background-image: -webkit-linear-gradient(top, #a3a3a3, #6e6e6e);
- background-image: -o-linear-gradient(top, #a3a3a3, #6e6e6e);
- background-image: linear-gradient(top, #a3a3a3, #6e6e6e);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#a3a3a3', endColorstr='#6e6e6e', GradientType=0);
- border:1px solid #575757;
- border-bottom-color: #333333;
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05);
- cursor: pointer;
- *margin-left: .3em;
+
+ *zoom: 1;
+ padding: 4px 10px 4px;
+ margin-bottom: 0;
+ font-size: 13px;
+ line-height: 18px;
+ color: #fff;
+ text-align: center;
+ vertical-align: middle;
+ background-image: -moz-linear-gradient(top, #a3a3a3, #6e6e6e);
+ background-image: -ms-linear-gradient(top, #a3a3a3, #6e6e6e);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#a3a3a3), to(#6e6e6e));
+ background-image: -webkit-linear-gradient(top, #a3a3a3, #6e6e6e);
+ background-image: -o-linear-gradient(top, #a3a3a3, #6e6e6e);
+ background-image: linear-gradient(top, #a3a3a3, #6e6e6e);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#a3a3a3', endColorstr='#6e6e6e', GradientType=0);
+ border:1px solid #575757;
+ border-bottom-color: #333333;
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05);
+ cursor: pointer;
+ *margin-left: .3em;
}
.btn.disabled,
.btn[disabled] {
- background: #fff;
+ background: #fff;
}
.btn:active,
.btn.active {
- background-color: #cccccc \9;
+ background-color: #cccccc \9;
}
.btn:first-child {
- *margin-left: 0;
+ *margin-left: 0;
}
.btn:hover {
- color: #fff;
- text-decoration: none;
- background-color: #e6e6e6;
- background-image: -moz-linear-gradient(top, #868686, #535353);
- background-image: -ms-linear-gradient(top, #868686, #535353);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#868686), to(#535353));
- background-image: -webkit-linear-gradient(top, #868686, #535353);
- background-image: -o-linear-gradient(top, #868686, #535353);
- background-image: linear-gradient(top, #868686, #535353);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#868686', endColorstr='#535353', GradientType=0);
+ color: #fff;
+ text-decoration: none;
+ background-color: #e6e6e6;
+ background-image: -moz-linear-gradient(top, #868686, #535353);
+ background-image: -ms-linear-gradient(top, #868686, #535353);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#868686), to(#535353));
+ background-image: -webkit-linear-gradient(top, #868686, #535353);
+ background-image: -o-linear-gradient(top, #868686, #535353);
+ background-image: linear-gradient(top, #868686, #535353);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#868686', endColorstr='#535353', GradientType=0);
}---*/
.btn.active,
.btn:active {
- background-image: none;
- -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255, 0.2);
- -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255,0.2);
- box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255, 0.2);
- background-color: #727272;
- outline: 0;
- border-top-color:#333333
+ background-image: none;
+ -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255, 0.2);
+ -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255,0.2);
+ box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255, 0.2);
+ background-color: #727272;
+ outline: 0;
+ border-top-color:#333333
}
.dark_class
{
From 3b588dcce814717ecc7ee1ac2021ac16fd0de798 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville
Date: Wed, 5 Nov 2014 17:27:08 -0500
Subject: [PATCH 14/21] Removed unnecessary call to set locale data on the
Login page
---
airtime_mvc/public/js/airtime/login/login.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/airtime_mvc/public/js/airtime/login/login.js b/airtime_mvc/public/js/airtime/login/login.js
index f21043c31..8c17106ed 100644
--- a/airtime_mvc/public/js/airtime/login/login.js
+++ b/airtime_mvc/public/js/airtime/login/login.js
@@ -1,6 +1,5 @@
-$(window).load(function(){
+$(window).load(function() {
$("#username").focus();
- $("#locale").val($.cookie("airtime_locale")!== null?$.cookie("airtime_locale"):$.cookie("default_airtime_locale"));
});
$(document).ready(function() {
From 3046003a1b6ef2f55121c6b760b1046761c871b8 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville
Date: Wed, 5 Nov 2014 17:27:41 -0500
Subject: [PATCH 15/21] Removed unnecessary cookie declaration for default
locale
---
airtime_mvc/public/js/airtime/preferences/preferences.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/airtime_mvc/public/js/airtime/preferences/preferences.js b/airtime_mvc/public/js/airtime/preferences/preferences.js
index 43d6a9bcb..e774033d0 100644
--- a/airtime_mvc/public/js/airtime/preferences/preferences.js
+++ b/airtime_mvc/public/js/airtime/preferences/preferences.js
@@ -110,7 +110,6 @@ $(document).ready(function() {
$.post(url, {format: "json", data: data}, function(json){
$('#content').empty().append(json.html);
- $.cookie("default_airtime_locale", $('#locale').val(), {path: '/'});
setTimeout(removeSuccessMsg, 5000);
showErrorSections();
setMailServerInputReadonly();
From 62a915f109270ff3a08c0e12993fedb18a4bae22 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville
Date: Thu, 6 Nov 2014 11:57:05 -0500
Subject: [PATCH 16/21] Added global define for application name
---
airtime_mvc/application/configs/constants.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php
index 34f8cab41..f6cc6840c 100644
--- a/airtime_mvc/application/configs/constants.php
+++ b/airtime_mvc/application/configs/constants.php
@@ -1,5 +1,7 @@
Date: Thu, 6 Nov 2014 18:24:29 -0500
Subject: [PATCH 17/21] Made several reoccurring strings into application
constants and altered any static strings containing them to use these
constants in string format calls.
---
.../application/controllers/ApiController.php | 6 ++--
.../application/forms/AddShowLiveStream.php | 2 +-
.../application/forms/RegisterAirtime.php | 9 ++++--
.../application/forms/SupportSettings.php | 9 ++++--
.../application/layouts/scripts/login.phtml | 27 ++++++++++++------
airtime_mvc/application/models/Auth.php | 3 +-
.../views/scripts/dashboard/about.phtml | 28 +++++++++++--------
.../views/scripts/dashboard/help.phtml | 14 ++++++----
.../form/preferences_watched_dirs.phtml | 3 +-
.../views/scripts/form/register-dialog.phtml | 20 +++++++------
.../views/scripts/form/support-setting.phtml | 17 +++++++----
.../views/scripts/login/index.phtml | 2 +-
.../views/scripts/partialviews/trialBox.phtml | 2 +-
.../views/scripts/systemstatus/index.phtml | 26 ++++++++---------
14 files changed, 101 insertions(+), 67 deletions(-)
diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 4001f7d50..6448342ae 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -768,7 +768,7 @@ class ApiController extends Zend_Controller_Action
//File is not in database anymore.
if (is_null($file)) {
- $return_hash['error'] = _("File does not exist in Airtime.");
+ $return_hash['error'] = sprintf(_("File does not exist in %s"), PRODUCT_NAME);
}
//Updating a metadata change.
else {
@@ -788,7 +788,7 @@ class ApiController extends Zend_Controller_Action
$md['MDATA_KEY_ORIGINAL_PATH'], $con);
if (is_null($file)) {
- $return_hash['error'] = _('File does not exist in Airtime');
+ $return_hash['error'] = sprintf(_('File does not exist in %s'), PRODUCT_NAME);
} else {
$filepath = $md['MDATA_KEY_FILEPATH'];
//$filepath = str_replace("\\", "", $filepath);
@@ -800,7 +800,7 @@ class ApiController extends Zend_Controller_Action
$file = Application_Model_StoredFile::RecallByFilepath($filepath, $con);
if (is_null($file)) {
- $return_hash['error'] = _("File doesn't exist in Airtime.");
+ $return_hash['error'] = sprintf(_('File does not exist in %s'), PRODUCT_NAME);
Logging::warn("Attempt to delete file that doesn't exist.
Path: '$filepath'");
} else {
diff --git a/airtime_mvc/application/forms/AddShowLiveStream.php b/airtime_mvc/application/forms/AddShowLiveStream.php
index 65e2a19d3..923c6993d 100644
--- a/airtime_mvc/application/forms/AddShowLiveStream.php
+++ b/airtime_mvc/application/forms/AddShowLiveStream.php
@@ -7,7 +7,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
public function init()
{
$cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth");
- $cb_airtime_auth->setLabel(_("Use Airtime Authentication:"))
+ $cb_airtime_auth->setLabel(sprintf(_("Use %s Authentication:"), PRODUCT_NAME))
->setRequired(false)
->setDecorators(array('ViewHelper'));
$this->addElement($cb_airtime_auth);
diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php
index 2da7083c8..1fcafc840 100644
--- a/airtime_mvc/application/forms/RegisterAirtime.php
+++ b/airtime_mvc/application/forms/RegisterAirtime.php
@@ -123,7 +123,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
// checkbox for publicise
$checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise");
- $checkboxPublicise->setLabel(_('Promote my station on Sourcefabric.org'))
+ $checkboxPublicise->setLabel(sprintf(_('Promote my station on %s'), COMPANY_SITE))
->setRequired(false)
->setDecorators(array('ViewHelper'))
->setValue(Application_Model_Preference::GetPublicise());
@@ -143,11 +143,14 @@ class Application_Form_RegisterAirtime extends Zend_Form
)
));
+ $privacyPolicyAnchorOpen = "";
// checkbox for privacy policy
$checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
$checkboxPrivacy->setLabel(
- sprintf(_("By checking this box, I agree to Sourcefabric's %sprivacy policy%s."),
- "",
+ sprintf(_('By checking this box, I agree to %s\'s %sprivacy policy%s.'),
+ COMPANY_NAME,
+ $privacyPolicyAnchorOpen,
""))
->setDecorators(array('ViewHelper'));
$this->addElement($checkboxPrivacy);
diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php
index 7ce63bcf0..87e5588de 100644
--- a/airtime_mvc/application/forms/SupportSettings.php
+++ b/airtime_mvc/application/forms/SupportSettings.php
@@ -119,7 +119,7 @@ class Application_Form_SupportSettings extends Zend_Form
// checkbox for publicise
$checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise");
- $checkboxPublicise->setLabel(_('Promote my station on Sourcefabric.org'))
+ $checkboxPublicise->setLabel(sprintf(_('Promote my station on %s'), COMPANY_SITE))
->setRequired(false)
->setDecorators(array('ViewHelper'))
->setValue(Application_Model_Preference::GetPublicise());
@@ -142,11 +142,14 @@ class Application_Form_SupportSettings extends Zend_Form
)
));
+ $privacyPolicyAnchorOpen = "";
// checkbox for privacy policy
$checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
$checkboxPrivacy->setLabel(
- sprintf(_("By checking this box, I agree to Sourcefabric's %sprivacy policy%s."),
- "",
+ sprintf(_('By checking this box, I agree to %s\'s %sprivacy policy%s.'),
+ COMPANY_NAME,
+ $privacyPolicyAnchorOpen,
""))
->setDecorators(array('ViewHelper'));
$this->addElement($checkboxPrivacy);
diff --git a/airtime_mvc/application/layouts/scripts/login.phtml b/airtime_mvc/application/layouts/scripts/login.phtml
index aa4030390..6a9879673 100644
--- a/airtime_mvc/application/layouts/scripts/login.phtml
+++ b/airtime_mvc/application/layouts/scripts/login.phtml
@@ -1,11 +1,11 @@
doctype() ?>
-
- headTitle() ?>
- headLink() ?>
- headScript() ?>
- google_analytics)?$this->google_analytics:"" ?>
+
+ headTitle() ?>
+ headLink() ?>
+ headScript() ?>
+ google_analytics)?$this->google_analytics:"" ?>
@@ -13,9 +13,20 @@
layout()->content ?>