Changeset 920


Ignore:
Timestamp:
05/27/09 14:12:28 (12 years ago)
Author:
amuller
Message:

Ticket #88 - Melhorias na visualização mensal adição d dependencia a calendar

Location:
trunk/expressoCalendar
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoCalendar/inc/class.bocalendar.inc.php

    r696 r920  
    7878                // Performing SQL query 
    7979                $day = getdate($dayTime); 
    80                 $query = "SELECT cal_id, title, description, datetime, edatetime FROM phpgw_cal where ".($this->cat_id>0?"(category=".$this->cat_id.") and":"")." (owner = '".$this->user_id."') and ((datetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and datetime < ".mktime(0,0,0,$day['mon']+1,$day['mday'],$day['year']).") or (edatetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and edatetime < ".mktime(0,0,0,$day['month']+1,$day['day'],$day['year'])."))"; 
     80                $query = "SELECT cal_id, title, description, datetime, edatetime FROM phpgw_cal where ".($this->cat_id>0?"(category=".$this->cat_id.") and":"")." (owner = '".$this->user_id."') and ((datetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and datetime < ".mktime(0,0,0,$day['mon']+1,$day['mday'],$day['year']).") or (edatetime > ".mktime(0,0,0,$day['mon'],$day['mday'],$day['year'])." and edatetime < ".mktime(0,0,0,$day['month']+1,$day['day'],$day['year']).")) order by datetime"; 
    8181                if (!$this->db->query($query)) 
    8282                        return false; 
  • trunk/expressoCalendar/js/calendar_functions.js

    r748 r920  
    6868        } 
    6969        document.getElementById('dragEventSubject').focus(); 
    70         document.getElementById('addEventLink').innerHTML = get_lang("Add this event"); 
    71         document.getElementById('addDetailsLink').innerHTML = get_lang("Add with details"); 
     70        document.getElementById('addEventLink').alt = get_lang("Add this event"); 
     71        document.getElementById('addEventLink').title = get_lang("Add this event"); 
     72        document.getElementById('addDetailsLink').alt = get_lang("Add with details"); 
     73        document.getElementById('addDetailsLink').title = get_lang("Add with details"); 
    7274 
    7375 
     
    165167                alert(e); 
    166168        } 
    167         document.getElementById('divAppbox').style.height = "100%"; 
    168169 
    169170        if (type == 'Week' || type == 'Month') 
     
    333334                var tdElement = document.getElementById(timeStamp2id(eventDiv.childNodes[0].id).substr(0,8)+'0000'); 
    334335                eventDiv.style.width = "60px"; 
    335                 eventDiv.style.height = "15px"; 
    336                 eventDiv.onmouseover = function () { if (this.childNodes[2].length > 9) this.style.width = "auto"; this.style.zIndex = 2; }; 
    337                 eventDiv.onmouseout = function () { this.style.width = "60px"; this.style.zIndex = 1; }; 
     336                eventDiv.style.height = "30px"; 
     337                eventDiv.onmouseover = function () { if (this.childNodes[2].length > 12) { this.style.width = "120px"; this.style.height = "auto"; } this.style.zIndex = 2; }; 
     338                eventDiv.onmouseout = function () { this.style.height = "30px"; this.style.width = "60px"; this.style.zIndex = 1; }; 
    338339                eventDiv.onclick = function () { calendar.getView('div_main','Day',eventDiv.childNodes[1].id); }; 
    339340                eventDiv.style.cursor = "pointer"; 
     
    341342                tdElement.style.height = (tdElement.childNodes.length * 10) + "px"; 
    342343 
    343                 if (tdElement.childNodes.length > 3) 
    344                         eventDiv.style.margin = "20 0 0 "+(20+(tdElement.childNodes.length-4)*25); 
    345                 else 
    346                         eventDiv.style.margin = "0 0 0 "+(20+(tdElement.childNodes.length-1)*25); 
     344                eventDiv.style.margin = (tdElement.childNodes.length-1)*25+" 0 0 "+(20+(tdElement.childNodes.length-1)*25); 
     345                tdElement.style.height = parseInt(tdElement.childNodes.length)*30; 
    347346        } 
    348347        if (tdElement == null) 
  • trunk/expressoCalendar/setup/setup.inc.php

    r632 r920  
    4444        /* Dependencies for this app to work */ 
    4545        $setup_info['expressoCalendar']['depends'][] = array( 
    46                 'appname' => 'phpgwapi', 
    47                 'versions' => Array('0.9.14','0.9.15','1.0.0') 
     46                'appname' => 'calendar', 
     47                'versions' => Array('0.9.3') 
    4848        ); 
    4949?> 
  • trunk/expressoCalendar/templates/default/index.tpl

    r696 r920  
    3131</tbody> 
    3232</table> 
    33 <div style="width:100%;height:100%" id="div_main"></div> 
     33<div style="width:100%;height:auto" id="div_main"></div> 
    3434<!-- END index --> 
  • trunk/expressoCalendar/xsl/addDialog.xsl

    r632 r920  
    2727                <td><font size="-1"><label forid="b_subject">Título:</label></font></td> 
    2828                <td class="" id="bubble_input"> 
    29                         <input style="height:18px" id="dragEventSubject" size="35" name="b_subject"/> 
     29                        <input style="height:18px" id="dragEventSubject" onclick="this.focus();" size="35" name="b_subject"/> 
    3030                </td> 
    3131        </tr> 
     
    3333                <td><font size="-1"><label forid="b_bdescription">Descrição:</label></font></td> 
    3434                <td class="" id="bubble_input"> 
    35                         <input style="height:18px" id="dragEventDescription" size="35" name="b_description"/> 
     35                        <input style="height:18px" id="dragEventDescription" onclick="this.focus();" size="35" name="b_description"/> 
    3636                </td> 
    3737        </tr> 
     
    3939        <table><tbody><tr> 
    4040                                <td> 
    41                                         <div id="addEventLink" class="buttontype" onclick="quickAddEvent(document.getElementById('dragEventSubject').value,document.getElementById('dragEventDescription').value,_dragArea.initEvent,_dragArea.endEvent);">Add event</div></td><td> 
    42                                 <div id="addDetailsLink" class="buttontype" onclick="addDetails(document.getElementById('dragEventSubject').value,document.getElementById('dragEventDescription').value,_dragArea.initEvent,_dragArea.endEvent);">Add with details</div></td> 
     41                                        <div id="addEventLink" style="height: 32; width: 32; background: url(templates/default/images/add.png) no-repeat;" onclick="quickAddEvent(document.getElementById('dragEventSubject').value,document.getElementById('dragEventDescription').value,_dragArea.initEvent,_dragArea.endEvent);"></div> 
     42                                </td> 
     43                                <td> 
     44                                        <div id="addDetailsLink" style="height: 32; width: 32; background: url(templates/default/images/details.png) no-repeat;" onclick="addDetails(document.getElementById('dragEventSubject').value,document.getElementById('dragEventDescription').value,_dragArea.initEvent,_dragArea.endEvent);"></div> 
     45                                </td> 
    4346                        </tr> 
    4447        </tbody></table> 
  • trunk/expressoCalendar/xsl/viewMonth.xsl

    r748 r920  
    2121                                        <xsl:for-each select="workday"> 
    2222                                                <xsl:variable name="day" select="id" /> 
    23                                                 <td class="td_day" id="{$day}"> 
     23                                                <td class="td_day" style="height: 15;" id="{$day}"> 
    2424                                                        <xsl:value-of select='substring($day,5,2)' /> 
    2525                                                </td> 
Note: See TracChangeset for help on using the changeset viewer.