Changeset 7041
- Timestamp:
- 08/16/12 16:13:04 (12 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/templates/default/assing_calendar.css
r6944 r7041 9 9 div.assing-calendar dl{margin: 5px !important;} 10 10 11 div.assing-calendar fieldset.add-user-search{width: 2 34px;}11 div.assing-calendar fieldset.add-user-search{width: 240px;} 12 12 div.assing-calendar input.search{width: 210px;} 13 13 … … 17 17 18 18 div.assing-calendar div.menu-container.footer-container{margin: 2px 0 -12px 0 !important;} 19 div.assing-calendar ul.search-result-list,div.assing-calendar ul.user-list{margin -left: -54px !important; width: 252px !important;}19 div.assing-calendar ul.search-result-list,div.assing-calendar ul.user-list{margin: 0; padding: 0; } 20 20 div.assing-calendar ul li{overflow: hidden !important;} 21 21 div.assing-calendar li.not-user{margin: 0 0 0 20px !important;} 22 div.assing-calendar fieldset.add-user-search{margin: 0 0 5px -10px !important;}22 div.assing-calendar fieldset.add-user-search{margin: 0 0 5px 0px !important;} 23 23 24 24 div.assing-calendar dd.add-user {height: 290px !important;} 25 25 26 div.assing-calendar dd.calendar-list li{height: 20px !important; margin: 0 0 0 10px !important;}26 div.assing-calendar dd.calendar-list li{height: 20px !important; margin: 0 0 0 0x !important;} 27 27 28 28 div.assing-calendar dd.calendar-list li div{display: block !important;} 29 29 30 div.assing-calendar dd.calendar{height: 24px;} 30 div.assing-calendar dd.calendar{height: 24px; text-align: left;} 31 32 div.assing-calendar ul.search-result-list{height: 245px;} 33 34 35 div.assing-calendar ul.search-result-list label.name{overflow: hidden; height: 15px;} 31 36 32 37 div.assing-calendar li.calendar-selected{ … … 36 41 div.assing-calendar li.calendar-selected a {margin: 0 0 -2px 15px;} 37 42 38 div.assing-calendar dd.calendar-list li.user-list{width: 333px; }43 div.assing-calendar dd.calendar-list li.user-list{width: 333px; list-style-type: none;} -
trunk/expressoAdmin1_2/templates/default/index.tpl
r5804 r7041 108 108 </tr> 109 109 </table> 110 < input type="hidden" id="assingCalendar"/>110 <div class="hidden" id="assingCalendar"/> 111 111 <!-- END body --> -
trunk/expressoAdmin1_2/templates/default/participants_search_itemlist.ejs
r5804 r7041 1 1 <% for (var i=0; i < data.length; i++) { %> 2 <li class="ui-widget-content" style="width: 6000px;" title="<%=data[i]['name']%>">2 <li class="ui-widget-content" style="width:230px;" title="<%=data[i]['name']%>"> 3 3 <input type="checkbox" name="opcao" <%= (data[i].enabled) ? '' : 'disabled="disabled"' %> /> 4 4 <input type="hidden" value="<%=data[i]['id']%>" /> -
trunk/prototype/Sync.php
r7025 r7041 9 9 $vars = array(); 10 10 11 $input = $_SERVER['REDIRECT_QUERY_STRING']; 11 if(isset($_SERVER['REDIRECT_QUERY_STRING'])) 12 $input = $_SERVER['REDIRECT_QUERY_STRING']; 13 12 14 if(!empty($input)){ 13 15 $pairs = explode("&", $input); -
trunk/prototype/modules/calendar/css/layout.css
r6996 r7041 193 193 display: inline-block; 194 194 border: none; 195 width: 21 5px;195 width: 213px; 196 196 } 197 197 … … 264 264 265 265 #calendar_addactivity_details8 .block-attendee-list, #calendar_addactivity_details8 .block-activity-list { width:430px; margin-right: 5px; } 266 267 div.assing-calendar dl.block-add-user.search{width: 255px;} 268 div.assing-calendar dt.add-user.search{width: 120px;} 269 266 270 267 271 .block-activity-list, .block-activity-group-select{width: 405px} … … 538 542 539 543 .shared-calendar .user-list li.user-list{ 540 height: 17px;544 height: 20px; 541 545 overflow: hidden; 542 546 position: relative; … … 552 556 height: 210px; 553 557 } 558 559 //Remover bordas indesejáveis no Ie 560 input[type="checkbox"]{border: none 0px;} 554 561 555 562 .user-acls-shared-calendar{ … … 683 690 .add-user fieldset.block-add-user{ 684 691 width: 245px; 692 } 693 694 div.assing-calendar .add-user fieldset.block-add-user{ 695 width: 234px; 696 margin: 0; 697 padding: 0; 685 698 } 686 699 -
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r7028 r7041 699 699 } 700 700 701 public function deepnessFindCalendarShared(&$uri, &$result, &$criteria, $original) { 702 if (isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != '0' && count($result) > 0) {703 704 $calendarIds = array();705 foreach ($result as $key => $value)706 array_push($calendarIds, $value['calendar']);707 708 $calendar = Controller::find(array('concept' => 'calendar'), false, array('filter' => array('AND', array('IN', 'id', $calendarIds), $original['criteria']['filter'])));709 710 if ($calendar && count($calendar) > 0){711 712 foreach ($calendar as $key => $value) {713 foreach ($result as $k => $r) {714 715 if ($r['calendar'] == $value['id']) {716 $r['calendar'] = $value;717 array_push($newResult, $r);718 }719 }720 }721 722 foreach ($newResult as $key => &$value) {723 if ($value['user'] != 0) {724 $user = $value['user'];725 $value['user'] = Controller::read(array('concept' => 'user', 'id' => $user));726 727 if (!$value['user'])728 $value['user'] = Controller::read(array('concept' => 'group', 'id' => $user));729 }730 }731 732 $result = $newResult;733 }else734 735 }701 public function deepnessFindCalendarShared(&$uri, &$result, &$criteria, $original) { 702 if (isset($original['criteria']['deepness']) && $original['criteria']['deepness'] != '0' && count($result) > 0) { 703 704 $calendarIds = array(); 705 foreach ($result as $key => $value) 706 array_push($calendarIds, $value['calendar']); 707 708 $calendar = Controller::find(array('concept' => 'calendar'), false, array('filter' => array('AND', array('IN', 'id', $calendarIds)))); 709 710 if ($calendar && count($calendar) > 0){ 711 $newResult = array(); 712 foreach ($calendar as $key => $value) { 713 foreach ($result as $k => $r) { 714 715 if ($r['calendar'] == $value['id']) { 716 $r['calendar'] = $value; 717 array_push($newResult, $r); 718 } 719 } 720 } 721 722 foreach ($newResult as $key => &$value) { 723 if ($value['user'] != 0) { 724 $user = $value['user']; 725 $value['user'] = Controller::read(array('concept' => 'user', 'id' => $user)); 726 727 if (!$value['user']) 728 $value['user'] = Controller::read(array('concept' => 'group', 'id' => $user)); 729 } 730 } 731 732 $result = $newResult; 733 }else 734 $result = ''; 735 } 736 736 } 737 737 -
trunk/prototype/modules/calendar/js/calendar.codecs.js
r7022 r7041 57 57 importCalendar: null, 58 58 sharedCalendar: null, 59 copyCalendar: null 59 copyCalendar: null, 60 assingCalendar: null 60 61 } 61 62 } … … 902 903 'priority': 'Prioridade', 903 904 'due' : 'Previsão de término' 904 } 905 }; 905 906 906 907 var statusDecoded = { … … 908 909 2: 'Em processo', 909 910 3: 'Finalzada', 910 4: 'Cancelada' ,911 } 911 4: 'Cancelada' 912 }; 912 913 913 914 var decodeDate = function(time){
Note: See TracChangeset
for help on using the changeset viewer.