Author: knguyen
Date: Thu Jul 19 14:51:35 2007
New Revision: 18040
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18040&repname=
=3Djahia
Log:
fix css style and IE7.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/colorsAndSty=
les.css
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/selectpa=
ge/select_page.jsp
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/colors=
AndStyles.css
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/css/colorsAndStyles.css&rev=3D18040&repna=
me=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/colorsAndSty=
les.css (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/css/colorsAndSty=
les.css Thu Jul 19 14:51:35 2007
@@ -10,6 +10,10 @@
color: #636363;
}
=
+.MainShell {
+ float:left;
+}
+
#editor legend {
color: #a1a192;
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/se=
lectpage/select_page.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/selectpage/select_page.jsp&rev=3D=
18040&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/selectpa=
ge/select_page.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/selectpa=
ge/select_page.jsp Thu Jul 19 14:51:35 2007
@@ -129,6 +129,7 @@
=
final String[] tabOptions =3D (String[]) engineMap.get("tabOptions=
");
final Integer activeTabOption =3D (Integer) engineMap.get("activeT=
abOption");
+ boolean isIE7 =3D Boolean.valueOf(request.getHeader("User-agent") =
!=3D null && request.getHeader("User-agent").indexOf("MSIE 7") !=3D -1);
%>
=
<script type=3D"text/javascript">
@@ -141,9 +142,13 @@
}
}
=
+ var isIE7 =3D <%if (isIE7){%>true<%} else{%>false<%}%>;
function engineCustomHandleOnLoad(){
- if ( AjxEnv.isIE ){
+ if ( isIE7 ){
+ initZimbraShell('MainShell',true,null,'userShell',true,false,'#ddd=
ddd');
+ } else if ( AjxEnv.isIE ){
initZimbraShell('MainShell',true,null,null,false,false,'#dddddd');
+ //initZimbraShell('MainShell',true,null,'userShell',true,false,'#d=
ddddd');
} else {
initZimbraShell('MainShell',true,null,'userShell',true,false,'#ddddd=
d');
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/page_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/page_field.jsp&rev=3D18040=
&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/p=
age_field.jsp Thu Jul 19 14:51:35 2007
@@ -149,6 +149,8 @@
boolean isInternalLink =3D true; //default
boolean isPageMoving =3D true; //default
=
+ boolean isIE7 =3D Boolean.valueOf(request.getHeader("User-agent") !=3D=
null && request.getHeader("User-agent").indexOf("MSIE 7") !=3D -1);
+
final ContentPage contentPage =3D jahiaPageBaseService.lookupContentPa=
ge(theField.getPageID(), false);
if (contentPage !=3D null) {
String defaultValue =3D theField.getDefinition().
@@ -275,9 +277,13 @@
}
}
=
+var isIE7 =3D <%if (isIE7){%>true<%} else{%>false<%}%>;
function engineCustomHandleOnLoad(){
- if ( AjxEnv.isIE ){
+ if ( isIE7 ){
+ initZimbraShell('MainShell',true,null,'userShell',true,false,'#dddddd'=
);
+ } else if ( AjxEnv.isIE ){
initZimbraShell('MainShell',true,null,null,false,false,'#dddddd');
+ //initZimbraShell('MainShell',true,null,'userShell',true,false,'#ddddd=
d');
} else {
initZimbraShell('MainShell',true,null,'userShell',true,false,'#dddddd'=
);
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
