[Fmsystem-commits] [8607]

[Torstein]

Revision: 8607
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8607
Author:   vator
Date:     2012-01-18 12:52:11 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicalendar.inc.php
    trunk/controller/templates/base/calendar/view_calendar_month.xsl
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-01-18 12:43:05 UTC 
(rev 8606)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-01-18 12:52:11 UTC 
(rev 8607)
@@ -107,7 +107,7 @@
                        $criteria = array
                        (
                                'user_id' => 
$GLOBALS['phpgw_info']['user']['account_id'],
-                               'type_id' => 2,
+                               'type_id' => 1,
                                'role_id' => 0, // For å begrense til en 
bestemt rolle - ellers listes alle roller for brukeren
                                'allrows' => false
                        );

Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2012-01-18 12:43:05 UTC (rev 8606)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2012-01-18 12:52:11 UTC (rev 8607)
@@ -27,7 +27,8 @@
                                <li><img height="15" 
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke 
gjennomført</span></li>
                        </ul>
                </div>
-                               
+               
+               <div id="cal_wrp">              
                <div style="float: left;margin-bottom: 10px;margin-left: 
735px;margin-top: 30px;"><a class="move_cal_right" href="#"><img 
src="controller/images/arrow_left.png" width="16"/></a></div>
                <div style="float:left;margin-top: 30px;margin-left: 374px;"><a 
class="move_cal_left" href="#"><img src="controller/images/arrow_right.png" 
width="16"/></a></div>
                
@@ -249,5 +250,6 @@
                                </xsl:choose>
                                </ul>
                        </div>
+               </div>
 </div>
 </xsl:template>

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-01-18 12:43:05 UTC 
(rev 8606)
+++ trunk/controller/templates/base/css/base.css        2012-01-18 12:52:11 UTC 
(rev 8607)
@@ -1256,4 +1256,7 @@
 }
 .quick_menu a{
        margin: 0 5px;  
+}
+#cal_wrp{
+       clear:both;
 }
\ No newline at end of file