Changeset 20557

Show
Ignore:
Timestamp:
03/09/10 09:19:48 (5 months ago)
Author:
umesha
Message:

some CSS and browser compatibility changes for notify pop up

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/core/web/css/global.css

    r20464 r20557  
    291291        font-weight: bold; 
    292292} 
     293 
     294#spaceParticipantDiv{ 
     295        width:100%; 
     296        overflow-x:hidden;  
     297        overflow-y: auto;  
     298} 

  • trunk/core/web/html/resource/management/components/BlogLayout.tml

    r20218 r20557  
    5050        document.write("<link rel=\"stylesheet\" type=\"text/css\" href=\""+JSPRootURL+"/styles/project.css?"+VERSION_NUMBER+"\"/>"); 
    5151}  
     52 
     53if(spaceForNavbar == 'person'){ 
     54        document.write("<link rel=\"stylesheet\" type=\"text/css\" href=\""+JSPRootURL+"/styles/personal.css?"+VERSION_NUMBER+"\"/>"); 
     55} else if(spaceForNavbar == 'project'){ 
     56        document.write("<link rel=\"stylesheet\" type=\"text/css\" href=\""+JSPRootURL+"/styles/project.css?"+VERSION_NUMBER+"\"/>"); 
     57} else if(spaceForNavbar == 'business'){ 
     58        document.write("<link rel=\"stylesheet\" type=\"text/css\" href=\""+JSPRootURL+"/styles/business.css?"+VERSION_NUMBER+"\"/>"); 
     59} 
     60 
    5261// --> 
    5362</script> 

  • trunk/core/web/html/resource/management/components/WikiLayout.tml

    r20218 r20557  
    4747        document.write("<style type=\"text/css\"> html { overflow: auto; } </style>"); 
    4848} 
    49 //added 
    50 document.write("<link rel=\"stylesheet\" type=\"text/css\" href=\""+ JSPRootURL +"/styles/project.css?"+VERSION_NUMBER+"\"/>"); 
    51 //end 
    5249 
    5350// --> 
    …… 
    116113        document.write("<script type='text/javascript' src="+spaceMenuURL+"><\/script>"); 
    117114        document.write("<script type='text/javascript' src="+navbarURL+"><\/script>"); 
    118  
     115         
     116        // added css for notify popup 
     117        if(spaceForNavbar == 'person'){ 
     118                document.write("<link rel=\"stylesheet\" type=\"text/css\" href=\""+JSPRootURL+"/styles/personal.css?"+VERSION_NUMBER+"\"/>"); 
     119        } else if(spaceForNavbar == 'project'){ 
     120                document.write("<link rel=\"stylesheet\" type=\"text/css\" href=\""+JSPRootURL+"/styles/project.css?"+VERSION_NUMBER+"\"/>"); 
     121        } else if(spaceForNavbar == 'business'){ 
     122                document.write("<link rel=\"stylesheet\" type=\"text/css\" href=\""+JSPRootURL+"/styles/business.css?"+VERSION_NUMBER+"\"/>"); 
     123        } 
    119124// --> 
    120125</script> 

  • trunk/core/web/jsp/notification/CreateSubscription2.jsp

    r20540 r20557  
    118118<head> 
    119119<title><display:get name="prm.global.application.title" /></title> 
     120<% if (StringUtils.isNotEmpty(checkPopup) && checkPopup.equals("0")) { %> 
    120121<template:getSpaceCSS/> 
    121         <%if(StringUtils.isNotEmpty(moduleType) && "project".equals(moduleType)){%> 
    122                 <template:getSpaceCSS space="project"/> 
    123         <%} %>   
     122<% } %> 
    124123<template:import type="javascript" src="/src/checkComponentForms.js" /> 
    125124<template:import type="javascript" src="/src/errorHandler.js" /> 

  • trunk/core/web/src/notifyPopup.js

    r20534 r20557  
    108108                        } 
    109109                        document.getElementById("name").focus(); 
    110                         setCheckBoxListDivHeight(document.getElementById('notifyEventsDiv'), 'input', 4, 'auto'); 
     110                        setCheckBoxListDivHeight(document.getElementById('notifyEventsDiv'), 'input', 4); 
    111111                        if(!checkIsPersonalSpace(isPersonalSpace)){                              
    112                         setCheckBoxListDivHeight(document.getElementById('spaceParticipantDiv'), 'input', 4, 'auto'); 
     112                        setCheckBoxListDivHeight(document.getElementById('spaceParticipantDiv'), 'input', 4); 
    113113                        } 
    114114           }, 
    …… 
    238238 
    239239// Method to set size of div containing single or multiple check boxes   
    240 function setCheckBoxListDivHeight(DivObject ,type , noOfCheckBox , overFlowStyle){ 
     240function setCheckBoxListDivHeight(DivObject ,type , noOfCheckBox){ 
    241241        if(DivObject && DivObject.getElementsByTagName(type).length > noOfCheckBox){ 
    242                 DivObject.style.overflow = overFlowStyle; 
    243242                DivObject.style.height = (noOfCheckBox * 22) + 'px'; 
    244243        }