Changeset 6881 for sandbox/2.4.2-expresso1/prototype
- Timestamp:
- 07/26/12 11:31:37 (12 years ago)
- Location:
- sandbox/2.4.2-expresso1/prototype/modules/calendar
- Files:
-
- 6 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.2-expresso1/prototype/modules/calendar/css/layout.css
r6876 r6881 226 226 227 227 .new-event-win ul.attendee-permissions-list, li.attendee-permissions-list, .new-task-win ul.attendee-permissions-list{text-align: left;} 228 .new-activity-win.active { 229 width:700px;height:510px;text-align:left; 230 } 231 232 .new-activity-win > .content.ui-tabs.ui-widget-content { 233 border: none; 234 } 235 .new-activity-win ul.attendee-permissions-list, li.attendee-permissions-list{text-align: left;} 228 236 229 237 li.attendee-permissions-list input{width: 20px !important; margin: 3px 0 0 0 !important;} … … 244 252 .new-task-win fieldset.block-add-attendee .add-attendee-search input { max-width: 290px; width: 290px; padding: 0 0 0 7px;} 245 253 246 247 fieldset.block-add-attendee .search-result-list { width: 255px; max-height: 215px; overflow: auto;} 248 fieldset.block-add-attendee .search-result-list .ui-widget-content { border: none;} 249 fieldset.block-add-attendee .search-result-list .empty { margin-left: 5px; } 254 .new-activity-win .menu-addevent { text-align: right; } 255 fieldset.block-add-attendee .add-attendee-search, fieldset.block-add-activity .add-activity-search { max-width: 250px; margin: 5px;} 256 fieldset.block-add-attendee .add-attendee-search input, fieldset.block-add-activity .add-activity-search input { max-width: 220px; width: 220px; padding: 0 0 0 7px;} 257 fieldset.block-add-attendee .search-result-list, fieldset.block-add-activity .search-result-list { width: 255px; max-height: 215px; overflow: auto;} 258 fieldset.block-add-attendee .search-result-list .ui-widget-content, fieldset.block-add-activity .search-result-list .ui-widget-content { border: none;} 259 fieldset.block-add-attendee .search-result-list .empty, fieldset.block-add-activity .search-result-list .empty { margin-left: 5px; } 250 260 fieldset.block-add-user .add-user-search {max-width: 235px;} 251 261 fieldset.block-add-user .search-result-list {max-width: 245px;} 252 fieldset.block-add-user .search-result-list .ui-widget-content {max-width: 245px;} 253 254 .block-attendee-list, .block-add-attendee { float:left;} 262 fieldset.block-add-user .search-result-list .ui-widget-content, fieldset.block-add-user .search-result-list .ui-widget-content {max-width: 245px;} 263 264 #calendar_addactivity_details8 .block-attendee-list, #calendar_addactivity_details8 .block-activity-list { width:430px; margin-right: 5px; } 265 266 .block-attendee-list, .block-activity-list, .block-add-activity { float:left;} 255 267 .block-attendee-list { width:400px; margin-right: 5px; } 256 268 .new-event-win .block-add-attendee { width:260px; margin-right: 5px; } 257 269 .new-task-win .block-add-attendee { width:335px; margin-right: 5px; } 258 .block-attendee-list dd, .block-add-attendee dd { border: 1px solid #BFBFBF; }259 .block-attendee-list dt, .block-add-attendee dt { background-color:#FFF; margin: 5px 0 -6px 5px; font-weight: bold; display: table; position: relative;}270 .block-attendee-list dd, .block-add-attendee dd, .block-activity-list dd, .block-add-activity dd { border: 1px solid #BFBFBF; } 271 .block-attendee-list dt, .block-add-attendee dt,.block-activity-list dt, .block-add-activity dt { background-color:#FFF; margin: 5px 0 -6px 5px; font-weight: bold; display: table; position: relative; display: table;} 260 272 .block-attendee-list dd.attendee-list { height: 196px; } 261 .block-attendee-list dd.attendee-list ul { max-height: 186px; overflow: auto; margin-top: 10px;} 262 .block-attendee-list dd.attendee-list-add {border-top:none !important; border:1px solid #BFBFBF;} 263 .block-attendee-list dd.attendee-list-add fieldset.add-attendee-input { border:none !important; margin: 0; padding: 0 } 264 .block-attendee-list dd.attendee-list-brief { border:none !important; margin: 5px 0; color:#777; } 265 266 dl.block-add-attendee { 273 .block-attendee-list dd.attendee-list ul, .block-activity-list dd.task-activity-list ul { max-height: 186px; overflow: auto; margin-top: 10px;} 274 .block-attendee-list dd.attendee-list-add, .block-activity-list dd.activity-list-add {border-top:none !important; border:1px solid #BFBFBF;} 275 .block-attendee-list dd.attendee-list-add fieldset.add-attendee-input, .block-activity-list dd.activity-list-add fieldset.add-activity-input { border:none !important; margin: 0; padding: 0 } 276 .block-attendee-list dd.attendee-list-brief, .block-activity-list dd.activity-list-brief { border:none !important; margin: 5px 0; color:#777; } 277 #calendar_addactivity_details8 .block-attendee-list, #calendar_addactivity_details8 .block-activity-list { width:430px; margin-right: 5px; } 278 .block-activity-list dd.task-activity-list { height: 292px; } 279 280 dl.block-add-attendee, dl.block-add-activity { 267 281 float: right; 268 282 display: block; 269 283 } 270 284 271 .new-event-win dl.block-add-attendee dd.add-attendee {285 .new-event-win dl.block-add-attendee dd.add-attendee, dl.block-add-activity dd.add-activity { 272 286 width: 260px; 273 287 min-height: 260px; … … 281 295 } 282 296 297 #calendar_addactivity_details8 dl.block-add-attendee dd.add-attendee ,#calendar_addactivity_details8 dl.block-add-activity dd.add-activity { 298 width: 260px; 299 min-height: 292px; 300 display: block; 301 } 302 303 283 304 ul.attendees-count {clear:left; float:left;} 284 305 .attendees-count li {display: inline;} … … 294 315 .attendees-list .me .add-attendee-options-button {position: absolute; top: 171px;} 295 316 .attendees-list .hover-attendee { background-color: #DFEFFC;} 317 .task-activity-list .hover-activity { background: #DFEFFC;} 296 318 /* 297 319 .attendees-list .attendee-options-button-edit { position: absolute; top:0; right:25px;} … … 301 323 302 324 .attendee-options{ position: absolute; top: 0; left: 287px; background-color: white; z-index: 100; width: 90px; background-color: #FFF; padding: 0 20px 0 3px; text-align: right;} 303 .attendees-list .not-attendee { height:16px; }325 .attendees-list .not-attendee, .activitys-list .not-activity { height:16px; } 304 326 305 327 .list-delegates{margin: 0 0 0 25px;} … … 308 330 309 331 .attendees-list .me .add-attendee-search input { max-width: 125px; } 310 .attendees-list li.organizer, .attendees-list li.me-delegated 332 .attendees-list li.organizer, .attendees-list li.me-delegated, .activitys-list li.organizer {margin-bottom: 3px;} 311 333 .attendees-list .organizer .button.swap { 312 334 float: right; … … 350 372 } 351 373 dd.attendee-list ul.attendee-list li label[title=''] { display:none } 374 dd.task-activity-list ul.task-activity-list li { 375 overflow: hidden; 376 position: relative; 377 } 378 379 380 dd.task-activity-list ul.task-activity-list li label.name, 381 dd.task-activity-list ul.task-activity-list li label.mail { 382 width: 99999px; 383 min-width: 99999px; 384 } 385 dd.task-activity-list ul.task-activity-list li label[title=''] { display:none } 352 386 /* 353 387 dd.attendee-list ul.attendee-list li .button.close { … … 873 907 .new-task-win fieldset fieldset, .new-task-win fieldset.tab-level2 fieldset{ padding: 5px 0; } 874 908 909 .new-activity-win fieldset { border: none; margin: 0; padding: 0; } 910 .new-activity-win fieldset.tab-level2 { padding: 0px 5px; } 911 .new-activity-win fieldset fieldset, .new-activity-win fieldset.tab-level2 fieldset { padding: 5px 0; } 912 875 913 .hidden { 876 914 display: none; … … 915 953 .new-event-win form.form-addevent { padding: 9px; } 916 954 955 .new-activity-win div.div-addtask { padding: 0; width: 774px; border: 0;} 956 .new-activity-win div.div-addactivity { padding: 0; width: 734px; border: 0;} 957 .new-activity-win form.form-addevent { padding: 9px; } 917 958 .ui-dialog .ui-dialog-content { padding: 0; } 918 959 .new-event-win div.div-addevent, .new-task-win div.div-addtask { padding: 0; width: 700px; border: 0;} 919 960 .new-event-win form.form-addevent, .new-task-win form.form-addtask { padding: 9px; } 961 .new-activity-win div.div-addevent { padding: 0; width: 700px; border: 0;} 962 .new-activity-win form.form-addevent { padding: 9px; } 920 963 921 964 .expresso-calendar-container input[type="text"] { height: 18px; } … … 940 983 941 984 .expresso-calendar-container input.h1, 942 .new-event-win input.h1, .new-task-win input.h1 {985 .new-event-win input.h1, .new-task-win input.h1, .new-activity-win input.h1 { 943 986 font-size: 150%; 944 987 font-weight: bold; … … 947 990 } 948 991 949 .new-event-win textarea, .new-task-win textarea {992 .new-event-win textarea, .new-task-win textarea, .new-activity-win textarea { 950 993 width:600px; 951 994 height: 210px; … … 958 1001 .new-event-win p.input-group label, .new-task-win p.input-group label { display: inline-block; width: 65px;} 959 1002 .new-event-win p.input-group label.input-group, .new-task-win p.input-group label.input-group { display: inline-block; width: 110px; font-weight: bold;} 1003 .new-activity-win p.input-group label { display: inline-block; width: 65px;} 1004 .new-activity-win p.input-group label.input-group { display: inline-block; width: 110px; font-weight: bold;} 960 1005 961 1006 input.number {text-align: right} … … 999 1044 .new-event-win fieldset.block-attendee-list, .new-task-win fieldset.block-attendee-list { width: 300px; max-height:180px; padding: 5px; float: left;} 1000 1045 .new-event-win fieldset.block-attendee-list ul, .new-task-win fieldset.block-attendee-list ul { height:160px; overflow: auto;} 1046 /**/ 1047 .new-activity-win fieldset.event-repeat-container label, 1048 .new-activity-win p.input-group.event-repeat-weekly label, 1049 .new-activity-win p.input-group.event-repeat-monthly label { 1050 width: auto; 1051 } 1052 1053 .new-activity-win fieldset.input-field-rounded, 1054 .new-activity-win fieldset.search-field, 1055 .new-activity-win fieldset.block-add-attendee-permissions, 1056 .new-activity-win fieldset.block-attendee-list { 1057 border:1px solid #CFCFCF; 1058 } 1059 1060 .new-activity-win fieldset.block-attendee-list { width: 300px; max-height:180px; padding: 5px; float: left;} 1061 .new-activity-win fieldset.block-attendee-list ul { height:160px; overflow: auto;} 1001 1062 1002 1063 -
sandbox/2.4.2-expresso1/prototype/modules/calendar/css/style.css
r6876 r6881 51 51 .new-event-win fieldset#calendar_addevent_details5 .button-files-upload, .new-task-win fieldset#calendar_addevent_details5 .button-files-upload{margin: 15px 0 0 0} 52 52 .new-event-win fieldset fieldset, .new-event-win fieldset.tab-level2 fieldset, .new-task-win fieldset fieldset, .new-event-win fieldset.tab-level2 fieldset { padding: 5px 0; } 53 54 .new-activity-win fieldset { border: none; margin: 0; padding: 0; } 55 .new-activity-win fieldset.tab-level2 { padding: 0px 5px; min-height: 310px; max-height: 310px; overflow: auto;} 56 57 .new-activity-win .overflow_add_calender { overflow: auto; max-height: 320px; } 58 .new-activity-win fieldset#calendar_addevent_details7 { overflow: hidden} 59 .new-activity-win fieldset#calendar_addevent_details5 .button-files-upload{margin: 15px 0 0 0} 60 .new-activity-win fieldset fieldset, .new-activity-win fieldset.tab-level2 fieldset { padding: 5px 0; } 53 61 54 62 .hidden { … … 96 104 .new-event-win form.form-addevent, .new-task-win form.form-addtask { padding: 9px; } 97 105 106 .new-activity-win div.div-addevent { padding: 0; width: 700px; border: 0;} 107 .new-activity-win form.form-addevent { padding: 9px; } 108 98 109 .expresso-calendar-container input[type="text"] { height: 18px; } 99 110 .expresso-calendar-container input[type="text"], … … 124 135 height: 150%; 125 136 } 137 .new-activity-win input.h1 { 138 font-size: 150%; 139 font-weight: bold; 140 width: 64%; 141 height: 150%; 142 } 126 143 127 144 .expresso-calendar-container input.h1, … … 140 157 } 141 158 159 .new-activity-win textarea { 160 width:600px; 161 height: 210px; 162 border: 1px solid #CFCFCF; 163 padding: 0px; 164 } 142 165 span.input-group { display: block; } 143 166 /*p.input-group label { vertical-align: top; }*/ 144 167 .new-event-win p.input-group label, .new-task-win p.input-group label { display: inline-block; width: 65px;} 145 168 .new-event-win p.input-group label.input-group, .new-task-win p.input-group label.input-group { display: inline-block; width: 110px; font-weight: bold;} 169 .new-activity-win p.input-group label { display: inline-block; width: 65px;} 170 .new-activity-win p.input-group label.input-group { display: inline-block; width: 110px; font-weight: bold;} 146 171 147 172 input.number {text-align: right} … … 169 194 { 170 195 width: auto; 196 } 197 198 .new-activity-win fieldset.event-repeat-container label, 199 .new-activity-win p.input-group.event-repeat-weekly label, 200 .new-activity-win p.input-group.event-repeat-monthly label { 201 width: auto; 171 202 } 172 203 … … 185 216 .new-event-win fieldset.block-attendee-list ul, .new-task-win fieldset.block-attendee-list ul { height:160px; overflow: auto;} 186 217 218 .new-activity-win fieldset.input-field-rounded, 219 .new-activity-win fieldset.search-field, 220 .new-activity-win fieldset.block-add-attendee-permissions, 221 .new-activity-win fieldset.block-attendee-list { 222 border:1px solid #CFCFCF; 223 } 224 /*Duvida*/ 225 .new-event-win fieldset.block-attendee-list { width: 300px; max-height:180px; padding: 5px; float: left;} 226 .new-event-win fieldset.block-attendee-list ul { height:160px; overflow: auto;} 227 228 .new-activity-win fieldset.block-attendee-list { width: 300px; max-height:180px; padding: 5px; float: left;} 229 .new-activity-win fieldset.block-attendee-list ul { height:160px; overflow: auto;} 230 187 231 188 232 /* # add attendee */ … … 503 547 .div-addtask #calendar_addtask_details1 .end-time{ width: 40px; } 504 548 .div-addtask #calendar_addtask_details1 .end-date{ width: 80px; } 505 .div-addtask #calendar_addtask_details1 .previsao-termino { margin: 0 0 0 5 px; }549 .div-addtask #calendar_addtask_details1 .previsao-termino { margin: 0 0 0 50px; } 506 550 .div-addtask #calendar_addtask_details1 .subitem { margin: 5px; display: block;} 507 551 .div-addtask #calendar_addtask_details1 .subitem .span_done{ margin: 0 30px;} … … 510 554 511 555 512 .div-addtask #calendar_addtask_details8 .parent {width: 7 25px; min-height: 278px; float: left;}556 .div-addtask #calendar_addtask_details8 .parent {width: 715px; min-height: 208px; float: left;} 513 557 .div-addtask #calendar_addtask_details8 .parent .child-top {width: 745px; height: 30px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;} 514 .div-addtask #calendar_addtask_details8 .parent .child-bottom {width: 745px; height: 2 78px; overflow: auto; float: left; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}558 .div-addtask #calendar_addtask_details8 .parent .child-bottom {width: 745px; height: 208px; overflow: auto; float: left; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;} 515 559 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each { height: 30px; } 516 560 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each:hover { background: #FFF2F2; cursor: pointer;} … … 527 571 .div-addtask #calendar_addtask_details8 .parent .child-top .organization { width: 70%; float: left; background: #E8F4FD; height: 30px; border-left: 1px solid #CCC; font-weight: bold; color: #2E6E9E; } 528 572 .div-addtask #calendar_addtask_details8 .parent .child-top .organization span{margin: 8px; float: left; } 573 /*Atividades*/ 574 575 .div-addactivity #calendar_addactivity_details5 .button-files-upload { margin: 0 0 0 5px; } 576 .div-addactivity #calendar_addactivity_details1 .h1{ width: 100%;} 577 .div-addactivity #calendar_addactivity_details2 textarea { width: 635px; } 578 .div-addactivity{ width: 734px;} 579 .div-addactivity #calendar_addactivity_details1 .time-previsao { width: 40px; } 580 .div-addactivity #calendar_addactivity_details1 .date-previsao{ width: 80px; } 581 582 .div-addactivity #calendar_addactivity_details1 .start-time{ width: 40px; } 583 .div-addactivity #calendar_addaActivity_details1 .start-date{ width: 80px; } 584 .div-addactivity #calendar_addactivity_details1 .end-time{ width: 40px; } 585 .div-addactivity #calendar_addactivity_details1 .end-date{ width: 80px; } 586 .div-addactivity #calendar_addactivity_details1 .previsao-termino { margin: 0 0 0 50px; } 587 .div-addactivity #calendar_addactivity_details1 .subitem { margin: 5px; display: block;} 588 .div-addactivity #calendar_addactivity_details1 .subitem .span_done{ margin: 0 30px;} 589 .div-addactivity #calendar_addactivity_details1 .calendar_addevent_details_lnk_timezone { margin: 0 0 0 20px;} 590 .div-addactivity #calendar_addactivity_details1 .subitem .done { width: 45px;} 591 592 593 .div-addactivity #calendar_addactivity_details6 .parent {width: 680px; min-height: 268px; float: left;} 594 .div-addactivity #calendar_addactivity_details6 .parent .child-top {width: 690px; height: 30px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;} 595 .div-addactivity #calendar_addactivity_details6 .parent .child-bottom {width: 690px; height: 220px; overflow: auto; float: left; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;} 596 .div-addactivity #calendar_addactivity_details6 .parent .child-bottom .child-bottom-each { height: 30px; } 597 .div-addactivity #calendar_addactivity_details6 .parent .child-bottom .child-bottom-each:hover { background: #FFF2F2; cursor: pointer;} 598 599 600 .div-addactivity #calendar_addactivity_details6 .parent .child-bottom .child-bottom-each .date-hour { width: 30%; float: left; height: 30px} 601 .div-addactivity #calendar_addactivity_details6 .parent .child-bottom .child-bottom-each .date-hour span { margin: 8px; float: left; } 602 .div-addactivity #calendar_addactivity_details6 .parent .child-bottom .child-bottom-each .organization{ width: 69%; float: left; height: 30px; border-left: 1px solid #CCC; } 603 .div-addactivity #calendar_addactivity_details6 .parent .child-bottom .child-bottom-each .organization span{ margin: 8px; float: left; } 604 605 606 .div-addactivity #calendar_addactivity_details6 .parent .child-top .date-hour { width: 29%; float: left; background: #E8F4FD; height: 30px; } 607 .div-addactivity #calendar_addactivity_details6 .parent .child-top .date-hour span{ margin: 8px; float: left; font-weight: bold; color: #2E6E9E; } 608 .div-addactivity #calendar_addactivity_details6 .parent .child-top .organization { width: 70%; float: left; background: #E8F4FD; height: 30px; border-left: 1px solid #CCC; font-weight: bold; color: #2E6E9E; } 609 .div-addactivity #calendar_addactivity_details6 .parent .child-top .organization span{margin: 8px; float: left; } -
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js
r6880 r6881 939 939 // load template of attendees 940 940 var blkAddAtendee = UI.dialogs.addEvent.find('#calendar_addevent_details6').append(attendeeHtml); 941 if(objEvent.attendee.length) 942 callbackAttendee(); 941 943 942 /** 944 943 Opções de delegação do participante/organizer … … 981 980 982 981 blkAddAtendee.find('.attendee-list-add .add-attendee-input input').keydown(function(event) { 983 984 982 if (event.keyCode == '13' && $(this).val() != '' || (event.keyCode == undefined && $(this).val() != '')) { 985 983 Encoder.EncodeType = "entity"; … … 1195 1193 $(this).val(''); 1196 1194 1197 } else if (!skipAddNewLine) { 1195 } else if (!skipAddNewLine) { 1198 1196 /** 1199 1197 * a) salva como novo usuario externo no banco (apenas com email) e... … … 1377 1375 } 1378 1376 }); 1377 1379 1378 //$('.block-add-attendee .search-result-list').selectable(); 1380 1379 -
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/init.js
r6876 r6881 166 166 hide: false, 167 167 content: { 168 text: $('<div></div>').html( DataLayer.render( 'templates/task_quick_add.ejs', { } ) ),168 text: $('<div></div>').html( DataLayer.render( 'templates/task_quick_add.ejs', {"componente" : componente} ) ), 169 169 title: { 170 170 text:'Nova tarefa', … … 250 250 var startEvent = new Date(); 251 251 var configData = (startEvent.toString('mm') < 30) ? {minutes: (30 - parseInt(startEvent.toString('mm')))} : {hours: 1, minutes: '-'+startEvent.toString('mm')}; 252 startEvent.add(configData); 252 startEvent.add(configData); 253 253 254 254 var componente = $(this); … … 276 276 } 277 277 }); 278 279 $(".button.add.add-activity").click(function(event){ 280 var startEvent = new Date(); 281 var configData = (startEvent.toString('mm') < 30) ? {minutes: (30 - parseInt(startEvent.toString('mm')))} : {hours: 1, minutes: '-'+startEvent.toString('mm')}; 282 startEvent.add(configData); 283 284 activityDetails({ 285 startTime: startEvent.getTime(), 286 endTime: dateCalendar.decodeRange(startEvent, (!!User.preferences.defaultCalendar ? ( !!Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration ? 287 (Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration) : (User.preferences.defaultDuration)) : (User.preferences.defaultDuration))) 288 }, true ); 289 290 }); 278 291 279 292 var calendar = $('#calendar').fullCalendar(DataLayer.merge({ -
sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/index.ejs
r6857 r6881 88 88 <script type='text/javascript' src='<?= MODULESURL ?>/js/map.disponibility.js'></script> 89 89 90 <script type='text/javascript' src='<?= MODULESURL ?>/js/activity.helpers.js'></script> 90 91 <script type='text/javascript' src='<?= MODULESURL ?>/js/task.helpers.js'></script> 91 92 <script type='text/javascript' src='<?= MODULESURL ?>/js/helpers.js'></script> … … 127 128 <a class="button add add-event" href="#">Adicionar evento</a> 128 129 <a class="button add add-task" href="#">Adicionar tarefa</a> 130 <a class="button add add-activity" href="#">Adicionar atividade</a> 129 131 <!--<a class="button add" href="#" onclick="add_events_list();">Lista de Eventos</a>--> 130 132 <div class="mini-calendar"></div>
Note: See TracChangeset
for help on using the changeset viewer.