dpillot 2005/11/03 18:49:01 CET
Modified files:
core/src/webapp/views/administration/common
servermode_admin_header.jsp
core/src/webapp/views/administration/htmleditors main.jsp
core/src/webapp/views/administration admin_default_layout.jsp
Log:
last chance cosmetics
Revision Changes Path
1.4 +38 -9
jahia/core/src/webapp/views/administration/admin_default_layout.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/administration/admin_default_layout.jsp.diff?r1=1.3&r2=1.4&f=h
1.4 +6 -2
jahia/core/src/webapp/views/administration/common/servermode_admin_header.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/administration/common/servermode_admin_header.jsp.diff?r1=1.3&r2=1.4&f=h
1.2 +7 -3
jahia/core/src/webapp/views/administration/htmleditors/main.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/administration/htmleditors/main.jsp.diff?r1=1.1&r2=1.2&f=h
Index: servermode_admin_header.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/views/administration/common/servermode_admin_header.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- servermode_admin_header.jsp 2 Nov 2005 17:03:27 -0000 1.3
+++ servermode_admin_header.jsp 3 Nov 2005 17:49:01 -0000 1.4
@@ -3,10 +3,14 @@
<[EMAIL PROTECTED] file="/views/administration/common/taglibs.jsp" %>
<jsp:useBean id="URL" class="java.lang.String" scope="request"/>
- <tr>
+ <!--tr>
<td><img
src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.header.image"/>" width="126" height="63" alt=""></td>
<td width="100%"
background="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.headerBg.image"/>" align="right" valign="middle"><img
src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.engines.jahiaTools.pix.image"/>" width="80"
height="31"></td>
+ </tr-->
+ <tr>
+ <td width="100"><img src="<%=URL%>/images/pix.gif"
width="100" height="25" alt=""></td>
+ <td width="404"><img src="<%=URL%>/images/pix.gif"
width="404" height="25" alt=""></td>
</tr>
<tr>
- <td align="center" class="text"><img
name="component" src="<%=URL%>/images/icons/admin/text_ok.gif" width="48"
height="48" border="0" align="middle"></td><td align="right"
class="text"> <b>:: <jahia:adminResourceBundle
resourceName="org.jahia.admin.serverSettings.label"/> ::</b> </td>
+ <td align="center" class="text"><img
name="component" src="<%=URL%>/images/icons/admin/text_ok.gif" width="48"
height="48" border="0" align="middle"></td><td align="left"
class="text"><br><h3><jahia:adminResourceBundle
resourceName="org.jahia.admin.serverSettings.label"/></h3> </td>
</tr>
Index: main.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/views/administration/htmleditors/main.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- main.jsp 30 Mar 2004 14:16:27 -0000 1.1
+++ main.jsp 3 Nov 2005 17:49:01 -0000 1.2
@@ -21,13 +21,17 @@
<td bgcolor="#92A4AD">
<table width="530" height="63" border="0" cellspacing="0"
cellpadding="0">
- <tr>
+ <!--tr>
<td width="126" height="63"><img
src="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.header.image"/>" width="126" height="63" alt=""></td>
<td width="404" height="63"
background="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.headerBg.image"/>"> </td>
+ </tr-->
+ <tr>
+ <td width="100"><img src="<%=url%>/images/pix.gif"
width="100" height="25" alt=""></td>
+ <td width="404"><img src="<%=url%>/images/pix.gif"
width="404" height="25" alt=""></td>
</tr>
<tr>
- <td align="right" class="text" colspan="2">
- <% if ( currentSite!= null
){%><jahia:adminResourceBundle
resourceName="org.jahia.admin.site.label"/> <%=currentSite.getServerName()%> <%}%>:: <jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.ManageHomepages.manageHomepages.label"/> ::</b>
+ <td align="left" class="text"
colspan="2"><h3><jahia:adminResourceBundle
resourceName="org.jahia.admin.homepages.ManageHomepages.manageHomepages.label"/><br>
+ <% if ( currentSite!= null
){%><jahia:adminResourceBundle
resourceName="org.jahia.admin.site.label"/> <%=currentSite.getServerName()%> <%}%></h3>
</tr>
</table>
Index: admin_default_layout.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/views/administration/admin_default_layout.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- admin_default_layout.jsp 7 Oct 2005 08:48:14 -0000 1.3
+++ admin_default_layout.jsp 3 Nov 2005 17:49:01 -0000 1.4
@@ -1,22 +1,51 @@
<[EMAIL PROTECTED] language = "java" %>
<[EMAIL PROTECTED] import = "java.util.*"%>
-
+<[EMAIL PROTECTED] import = "org.jahia.bin.Jahia"%>
<[EMAIL PROTECTED] file="/views/administration/common/taglibs.jsp" %>
-
<jsp:useBean id="URL" class="java.lang.String" scope="request"/> <% //
http files path. %>
<jsp:useBean id="jahiaDisplayMessage" class="java.lang.String"
scope="session"/>
-
<html>
<head>
<title><jahia:adminResourceBundle
resourceName="org.jahia.admin.jahiaAdministration.label"/></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="<%=URL%>/css/jahia.css" type="text/css">
<script type="text/javascript"
src="<%=URL%>/../javascript/jahia.js"></script>
-</head>
+ <style type="text/css">
+
+#copyright {
+ font-family: Verdana,Arial,Helvetica,sans-serif;
+ font-size: 12px;
+ color: #838383;
+
+}
+
+#poweredby {
+ color: #3E77B0;
+}
+
+.version {
+ float: right;
+ text-align: right;
+ font-size: 9px;
+ vertical-align: bottom;
+}
+
+h3 {
+ font-size: 16px;
+ color: #398EC3;
+ text-decoration: none;
+ font-weight: bold;
+}
+#copyright a:link {
+ color: #398EC3;
+ text-decoration: none;
+ font-weight: bold;
+}
+</style>
+</head>
<!-- Import all tiles attribute in request scope -->
<tiles:importAttribute scope="request"/>
-
<body class="install">
<div align="center">
@@ -37,7 +66,7 @@
<!--
Body main content -->
<tiles:insert attribute="body-content" ignore="true"/>
</td>
- </tr>
+ </tr>
</table>
</div>
</td>
@@ -48,9 +77,9 @@
<tr>
<td colspan="2" align="right">
- <br><br>
- <%=jahiaDisplayMessage%> <br>
- <br><br>
+ <table border="0" width="100%"><tr><td
width="48"><img name="logo" src="../jsp/jahia/images/logo-jahia.gif" border="0"
width="45" height="34"></td><td><img src="<%=URL%>images/pix.gif" border="0"
width="1" height="10">
+<div id="copyright"><%=Jahia.COPYRIGHT%></div><span class="version">Jahia v.
<%=Jahia.VERSION%></span>
+</td></tr></table>
</td>
</tr>
</table>
