CC-2289:Differentiate between time and duration
- css has been modified (from Vlad) - new image were added (from Vlad)
This commit is contained in:
james
parent
6a15f51aac
commit
7cc1f5c2e7
5 changed files with 124 additions and 84 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.2 KiB |
|
|
@ -331,8 +331,7 @@ fieldset.plain {
|
||||||
.padded-strong {
|
.padded-strong {
|
||||||
padding:10px;
|
padding:10px;
|
||||||
}
|
}
|
||||||
.input_text {
|
.input_text, input[type="text"], input[type="password"] {
|
||||||
background:#dddddd url("images/input_bg.png") repeat-x scroll 0 0 ;
|
|
||||||
font-family:Arial, Helvetica, sans-serif;
|
font-family:Arial, Helvetica, sans-serif;
|
||||||
border: 1px solid #5b5b5b;
|
border: 1px solid #5b5b5b;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
|
@ -341,14 +340,22 @@ fieldset.plain {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
text-indent: 3px;
|
text-indent: 3px;
|
||||||
width:auto;
|
width:auto;
|
||||||
|
background-color: #dddddd;
|
||||||
|
border: 1px solid #5b5b5b;
|
||||||
|
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type="text"]:focus, input[type="password"]:focus, textarea:focus, .input_text_area:focus {
|
||||||
|
border: 1px solid #0088f1;
|
||||||
}
|
}
|
||||||
.auto-search {
|
.auto-search {
|
||||||
background:#dddddd url(images/search_auto_bg.png) no-repeat 0 0;
|
background:#dddddd url(images/search_auto_bg.png) no-repeat 0 0;
|
||||||
text-indent:25px;
|
text-indent:25px;
|
||||||
}
|
}
|
||||||
.input_text_area {
|
.input_text_area, textarea {
|
||||||
background:#dddddd url("images/input_bg.png") repeat-x scroll 0 0 ;
|
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;
|
font-size: 13px;
|
||||||
text-indent: 3px;
|
text-indent: 3px;
|
||||||
}
|
}
|
||||||
|
|
@ -1200,10 +1207,14 @@ button, input {
|
||||||
margin-right:6px
|
margin-right:6px
|
||||||
}
|
}
|
||||||
.button-bar-top .input_text.hasDatepicker, .input_text.hasDatepicker {
|
.button-bar-top .input_text.hasDatepicker, .input_text.hasDatepicker {
|
||||||
background:url(images/input_with_calendar_bg.png) no-repeat right 0;
|
background-image:url(images/input_with_calendar_bg.png);
|
||||||
|
background-repeat:no-repeat;
|
||||||
|
background-position:right 0;
|
||||||
}
|
}
|
||||||
.input_text.hasTimepicker {
|
.input_text.hasTimepicker {
|
||||||
background:url(images/input_with_time_bg.png) no-repeat right 0;
|
background-image:url(images/input_with_time_bg.png);
|
||||||
|
background-repeat:no-repeat;
|
||||||
|
background-position:right 0;
|
||||||
}
|
}
|
||||||
ul.errors {
|
ul.errors {
|
||||||
display:block;
|
display:block;
|
||||||
|
|
@ -1445,11 +1456,12 @@ div.success{
|
||||||
}
|
}
|
||||||
.formrow-repeat li {
|
.formrow-repeat li {
|
||||||
list-style-type:none;
|
list-style-type:none;
|
||||||
margin:0 0 7px 0;
|
margin:0 0 8px 0;
|
||||||
padding:0;
|
padding:0;
|
||||||
/*height:26px;*/
|
height:25px;
|
||||||
display:block;
|
display:block;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
.formrow-repeat li .ui-button-icon-only {
|
.formrow-repeat li .ui-button-icon-only {
|
||||||
width:1.8em;
|
width:1.8em;
|
||||||
}
|
}
|
||||||
|
|
@ -1467,6 +1479,37 @@ div.success{
|
||||||
display: block;
|
display: block;
|
||||||
line-height: 110%;
|
line-height: 110%;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
#add_show_rebroadcast_relative .ui-button-icon-only,
|
||||||
|
#add_show_rebroadcast_absolute .ui-button-icon-only {
|
||||||
|
width: 1.8em;
|
||||||
|
}
|
||||||
|
#add_show_rebroadcast_relative .ui-button-icon-only .ui-button-text,
|
||||||
|
#add_show_rebroadcast_absolute .ui-button-icon-only .ui-button-text,
|
||||||
|
#add_show_rebroadcast_relative .ui-button-icons-only .ui-button-text,
|
||||||
|
#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;
|
||||||
|
}
|
||||||
|
|
||||||
|
#add_show_rebroadcast_relative .ui-button-icon-only .ui-icon,
|
||||||
|
#add_show_rebroadcast_absolute .ui-button-icon-only .ui-icon {
|
||||||
|
margin-top: -8px;
|
||||||
|
position: absolute;
|
||||||
|
top: 50%;
|
||||||
|
}
|
||||||
|
#add_show_rebroadcast_relative .ui-button-text-icon-primary .ui-icon,
|
||||||
|
#add_show_rebroadcast_absolute .ui-button-text-icon-primary .ui-icon {
|
||||||
|
left: 0.4em;
|
||||||
|
}
|
||||||
|
#add_show_rebroadcast_relative .ui-button .ui-button-text,
|
||||||
|
#add_show_rebroadcast_absolute .ui-button .ui-button-text {
|
||||||
|
display: block;
|
||||||
|
line-height: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
.formrow-repeat li .inline-text {
|
.formrow-repeat li .inline-text {
|
||||||
color: #666666;
|
color: #666666;
|
||||||
padding: 0 6px 0 0;
|
padding: 0 6px 0 0;
|
||||||
|
|
@ -1613,3 +1656,71 @@ dd.radio-inline-list, .preferences dd.radio-inline-list {
|
||||||
button.ui-button.md-cancel {
|
button.ui-button.md-cancel {
|
||||||
padding: .4em 1em;
|
padding: .4em 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*--//////////////////////// Changes/add-ons Jun 8th, 2011 ////////////////////////--*/
|
||||||
|
|
||||||
|
.dialogPopup.ui-dialog-content {
|
||||||
|
padding: 0.9em 1em;
|
||||||
|
}
|
||||||
|
.dialogPopup dl {
|
||||||
|
margin:0;
|
||||||
|
padding:0;
|
||||||
|
}
|
||||||
|
.dialogPopup dt {
|
||||||
|
margin:0;
|
||||||
|
padding: 0 0 5px;
|
||||||
|
}
|
||||||
|
.dialogPopup dt label {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
.dialogPopup dd {
|
||||||
|
margin:0 0 4px 0;
|
||||||
|
padding: 0 0 5px;
|
||||||
|
}
|
||||||
|
.dialogPopup dd input[type="text"]{
|
||||||
|
width:100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-text p {
|
||||||
|
font-size:12px;
|
||||||
|
color:#5b5b5b;
|
||||||
|
line-height:150%;
|
||||||
|
margin-top:0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dialogPopup label input[type="checkbox"] {
|
||||||
|
float:left;
|
||||||
|
margin-right:6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dialogPopup fieldset {
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
.dialogPopup fieldset dd input[type="text"] {
|
||||||
|
width:99%;
|
||||||
|
}
|
||||||
|
fieldset.display_field {
|
||||||
|
background-color:#d5d5d5;
|
||||||
|
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;
|
||||||
|
}
|
||||||
|
label span {
|
||||||
|
font-weight:normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dialogPopup .display_field dt, .dialogPopup .display_field dd {
|
||||||
|
color: #353535;
|
||||||
|
float: left;
|
||||||
|
font-size: 13px;
|
||||||
|
margin: 0;
|
||||||
|
min-width: 90px;
|
||||||
|
padding: 6px 0;
|
||||||
|
text-align: left;
|
||||||
|
width:60%;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
.dialogPopup .display_field dt {
|
||||||
|
clear: left;
|
||||||
|
font-weight:bold;
|
||||||
|
width:40%;
|
||||||
|
}
|
||||||
|
|
@ -349,88 +349,16 @@ function setAddShowEvents() {
|
||||||
var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]+' '+$('#add_show_end_time').val());
|
var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]+' '+$('#add_show_end_time').val());
|
||||||
|
|
||||||
if(startDateTime.getTime() > endDateTime.getTime()){
|
if(startDateTime.getTime() > endDateTime.getTime()){
|
||||||
$('#add_show_end_date_no_repeat').css('background', '#F49C9C');
|
$('#add_show_end_date_no_repeat').css('background-color', '#F49C9C');
|
||||||
$('#add_show_end_time').css('background', '#F49C9C');
|
$('#add_show_end_time').css('background-color', '#F49C9C');
|
||||||
}else{
|
}else{
|
||||||
$('#add_show_end_date_no_repeat').css('background', '');
|
$('#add_show_end_date_no_repeat').css('background-color', '');
|
||||||
$('#add_show_end_time').css('background', '');
|
$('#add_show_end_time').css('background-color', '');
|
||||||
}
|
}
|
||||||
|
|
||||||
// calculate duration
|
// calculate duration
|
||||||
calculateDuration(endDateTime, startDateTime);
|
calculateDuration(endDateTime, startDateTime);
|
||||||
});
|
});
|
||||||
// auto puplate end date and time
|
|
||||||
/*$('#add_show_start_date, #add_show_end_time_no_repeat').change(function(){
|
|
||||||
var startDate = $('#add_show_start_date').val().split('-');
|
|
||||||
var startDateTime = new Date(startDate[1]+' '+startDate[2]+','+startDate[0]);
|
|
||||||
|
|
||||||
var endDate = $('#add_show_end_date_no_repeat').val().split('-');
|
|
||||||
var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]);
|
|
||||||
|
|
||||||
if(startDateTime.getTime() > endDateTime.getTime()){
|
|
||||||
if($(this) == $('#add_show_start_date')){
|
|
||||||
var endDateTemp = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2);
|
|
||||||
$('#add_show_end_date_no_repeat').val(endDateTemp);
|
|
||||||
}else{
|
|
||||||
var startDateTemp = startDateTime.getFullYear() + '-' + pad(startDateTime.getMonth()+1,2) + '-' + pad(startDateTime.getDate(),2);
|
|
||||||
$('#add_show_end_date_no_repeat').val(startDateTemp);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var startDateTime = new Date(startDate[1]+' '+startDate[2]+','+startDate[0]+' '+$('#add_show_start_time').val());
|
|
||||||
|
|
||||||
var endDate = $('#add_show_end_date_no_repeat').val().split('-');
|
|
||||||
var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]+' '+$('#add_show_end_time').val());
|
|
||||||
|
|
||||||
// if changed start time is greater than end, set end time to start time + 1 hour
|
|
||||||
if(startDateTime.getTime() > endDateTime.getTime()){
|
|
||||||
endDateTime = new Date(startDateTime.getTime() + (1*60*60*1000));
|
|
||||||
}
|
|
||||||
|
|
||||||
var endDate = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2);
|
|
||||||
var endTime = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2);
|
|
||||||
|
|
||||||
$('#add_show_end_date_no_repeat').val(endDate);
|
|
||||||
$('#add_show_end_time').val(endTime);
|
|
||||||
|
|
||||||
// calculate duration
|
|
||||||
calculateDuration(endDateTime, startDateTime)
|
|
||||||
|
|
||||||
})
|
|
||||||
$('#add_show_start_time, #add_show_end_time').change(function(){
|
|
||||||
var startDate = $('#add_show_start_date').val().split('-');
|
|
||||||
var startDateTime = new Date(startDate[1]+' '+startDate[2]+','+startDate[0]+' '+$('#add_show_start_time').val());
|
|
||||||
|
|
||||||
var endDate = $('#add_show_end_date_no_repeat').val().split('-');
|
|
||||||
var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]+' '+$('#add_show_end_time').val());
|
|
||||||
|
|
||||||
if($(this) == $('#add_show_start_time')){
|
|
||||||
// if changed start time is greater than end, set end time to start time + 1 hour
|
|
||||||
if(startDateTime.getTime() > endDateTime.getTime()){
|
|
||||||
endDateTime = new Date(startDateTime.getTime() + (1*60*60*1000));
|
|
||||||
}
|
|
||||||
|
|
||||||
var endDate = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2);
|
|
||||||
var endTime = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2);
|
|
||||||
|
|
||||||
$('#add_show_end_date_no_repeat').val(endDate);
|
|
||||||
$('#add_show_end_time').val(endTime);
|
|
||||||
}else{
|
|
||||||
// if changed start time is greater than end, set end time to start time + 1 hour
|
|
||||||
if(startDateTime.getTime() > endDateTime.getTime()){
|
|
||||||
endDateTime = new Date(startDateTime.getTime() + (1*60*60*1000));
|
|
||||||
}
|
|
||||||
|
|
||||||
var endDate = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2);
|
|
||||||
var endTime = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2);
|
|
||||||
|
|
||||||
$('#add_show_end_date_no_repeat').val(endDate);
|
|
||||||
$('#add_show_end_time').val(endTime);
|
|
||||||
}
|
|
||||||
|
|
||||||
// calculate duration
|
|
||||||
calculateDuration(endDateTime, startDateTime)
|
|
||||||
})*/
|
|
||||||
|
|
||||||
function calculateDuration(endDateTime, startDateTime){
|
function calculateDuration(endDateTime, startDateTime){
|
||||||
var duration;
|
var duration;
|
||||||
|
|
@ -444,6 +372,7 @@ function setAddShowEvents() {
|
||||||
}
|
}
|
||||||
$('#add_show_duration').val(duration);
|
$('#add_show_duration').val(duration);
|
||||||
}
|
}
|
||||||
|
|
||||||
function pad(number, length) {
|
function pad(number, length) {
|
||||||
var str = '' + number;
|
var str = '' + number;
|
||||||
while (str.length < length) {
|
while (str.length < length) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue