Changeset 6958 for sandbox/2.4.2-expresso1/prototype/modules/calendar
- Timestamp:
- 08/08/12 09:54:17 (12 years ago)
- Location:
- sandbox/2.4.2-expresso1/prototype/modules/calendar
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.2-expresso1/prototype/modules/calendar/css/style.css
r6954 r6958 559 559 .div-addtask #calendar_addtask_details1 .calendar_addevent_details_lnk_timezone { margin: 0 0 0 20px;} 560 560 .div-addtask #calendar_addtask_details1 .subitem .done { width: 45px;} 561 .div-addtask #calendar_addtask_details1 .ui-spinner-buttons{ top: -14px !important;} 561 562 @-moz-document url-prefix() {.div-addtask #calendar_addtask_details1 .ui-spinner-buttons{ top: -14px !important;}} 563 564 @media screen and (-webkit-min-device-pixel-ratio:0){.div-addtask #calendar_addtask_details1 .ui-spinner-buttons{ top: -2px !important;}} 565 562 566 .div-addtask #calendar_addtask_details1 .ui-spinner-buttons .ui-spinner-up{height: 7px !important;} 563 567 .div-addtask #calendar_addtask_details1 .ui-spinner-buttons .ui-spinner-down{height: 8px !important;} … … 577 581 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each:hover { background: #FFF2F2; cursor: pointer;} 578 582 579 580 583 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .date-hour { width: 30%; float: left; height: 30px} 581 584 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .date-hour span { margin: 8px; float: left; } … … 583 586 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .organization span{ margin: 8px; float: left; } 584 587 585 586 588 .div-addtask #calendar_addtask_details8 .parent .child-top .date-hour { width: 29%; float: left; background: #E8F4FD; height: 30px; } 587 589 .div-addtask #calendar_addtask_details8 .parent .child-top .date-hour span{ margin: 8px; float: left; font-weight: bold; color: #2E6E9E; } … … 594 596 .div-addactivity #group_addactivity_details1 .h1{ width: 100%;} 595 597 .div-addactivity #group_addactivity_details2 textarea { width: 635px; } 596 .div-addactivity #group_addactivity_details1 .time- previsao{ width: 40px; }597 .div-addactivity #group_addactivity_details1 .date- previsao{ width: 80px; }598 .div-addactivity #group_addactivity_details1 .time-due { width: 40px; } 599 .div-addactivity #group_addactivity_details1 .date-due{ width: 80px; } 598 600 599 601 .div-addactivity #group_addactivity_details1 .start-time{ width: 40px; } … … 601 603 .div-addactivity #group_addactivity_details1 .end-time{ width: 40px; } 602 604 .div-addactivity #group_addactivity_details1 .end-date{ width: 80px; } 603 .div-addactivity #group_addactivity_details1 .previsao-termino { margin: 0 0 0 50px; }605 .div-addactivity #group_addactivity_details1 .previsao-termino { margin: 0 0 0 30px; } 604 606 .div-addactivity #group_addactivity_details1 .subitem { margin: 5px; display: block;} 605 607 .div-addactivity #group_addactivity_details1 .subitem .span_done{ margin: 0 30px;} -
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js
r6954 r6958 371 371 todoStatus('addActivity', (objActivity.activityStatus != undefined) ? objActivity.activityStatus : 1); 372 372 373 UI.dialogs.addActivity.find('select[name="activityStatus"]').attr('disabled', 'disabled'); 374 373 375 // ==== validation events ==== 374 UI.dialogs.addActivity.find(".input-group .h1").Watermark("Atividade sem t Ãtulo");376 UI.dialogs.addActivity.find(".input-group .h1").Watermark("Atividade sem título"); 375 377 376 378 UI.dialogs.addActivity.find(".number").numeric(); … … 420 422 } 421 423 */ 424 UI.dialogs.addActivity.find('select[name="activityStatus"]').removeAttr('disabled'); 422 425 canDiscardActivityDialog = true; 423 426 -
sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_add.ejs
r6954 r6958 15 15 </p> 16 16 <p class="input-group date-info"> 17 <input type="text" class=" date start-date" value="<%= (data.activity.startDate) ? data.activity.startDate : '' %>" name="startDate" />18 <input type="text" class="time start-time<%= (data.activity.allDay) ? ' hidden' : '' %>" value="<%= (data.activity.startHour) ? data.activity.startHour : '' %>" name="startHour" />17 <input type="text" class="start-date" readonly="readonly" value="<%= (data.activity.startDate) ? data.activity.startDate : '' %>" name="startDate" /> 18 <input type="text" class="time start-time<%= (data.activity.allDay) ? ' hidden' : '' %>" readonly="readonly" value="<%= (data.activity.startHour) ? data.activity.startHour : '' %>" name="startHour" /> 19 19 <span>até</span> 20 <input type="text" class=" date end-date" value="<%= (data.activity.endDate) ? data.activity.endDate : '' %>" name="endDate" />21 <input type="text" class="time end-time<%= (data.activity.allDay) ? ' hidden' : '' %>" value="<%= (data.activity.endHour) ? data.activity.endHour : '' %>" name="endHour" />20 <input type="text" class="end-date" readonly="readonly" value="<%= (data.activity.endDate) ? data.activity.endDate : '' %>" name="endDate" /> 21 <input type="text" class="time end-time<%= (data.activity.allDay) ? ' hidden' : '' %>" readonly="readonly" value="<%= (data.activity.endHour) ? data.activity.endHour : '' %>" name="endHour" /> 22 22 23 23 <span class="previsao-termino">Previsão término:</span> 24 <input type="text" class="date date-due" name="dueDate">25 <input type="text" class="time time-due" name="dueHour" >24 <input type="text" class="date-due" name="dueDate" readonly="readonly"> 25 <input type="text" class="time time-due" name="dueHour" readonly="readonly"> 26 26 27 27 <a href="#" class="group_addactivity_details_lnk_timezone">Fuso horário</a> … … 50 50 </p> 51 51 <div class="subitem"> 52 % Conclusão: <input type="number" name="percentage" class="done" value="<%= data.activity.percentage %>">52 % Conclusão: <input type="number" name="percentage" class="done" readonly="readonly" value="<%= data.activity.percentage %>"> 53 53 <span style="margin:0 0 0 5px;">Status:<span> 54 <select name="activityStatus" style="margin: 0 0 0 5px;">54 <select name="activityStatus" > 55 55 <option <%= (data.activity.activityStatus == '1') ? 'selected="selected"' : '' %> value="1">Sem ações</option> 56 56 <option <%= (data.activity.activityStatus == '2') ? 'selected="selected"' : '' %> value="2">Em Processo</option> … … 58 58 <option <%= (data.activity.activityStatus == '4') ? 'selected="selected"' : '' %> value="4">Cancelada</option> 59 59 </select> 60 <span style="margin:0 0 0 5px;">Prioridade <span>60 <span style="margin:0 0 0 5px;">Prioridade:<span> 61 61 <select name="priority"> 62 62 <option <%= (data.activity.priority == '1') ? 'selected="selected"' : '' %> value="1">Alta</option>
Note: See TracChangeset
for help on using the changeset viewer.