xlawrence 2005/11/03 12:03:58 CET
Modified files:
core/src/webapp/jsp/jahia/configuration_wizard
adv_settings.jsp
congratulations.jsp
error_configured.jsp
error_save.jsp
error_standalone.jsp
mail.jsp
root.jsp
server.jsp
site.jsp
templates.jsp
values.jsp
core/src/webapp/jsp/jahia/configuration_wizard/css styles.css
core/src/webapp/jsp/jahia/css colorsAndStyles.css
Added files:
core/src/webapp/jsp/jahia/css/images/icones check.gif
checks.gif
earth_preferences.gif
error.gif
mail_server.gif
server.gif
server_preferences.gif
Log:
Added some icons to the configuration wizard
Revision Changes Path
1.6 +1 -1
jahia/core/src/webapp/jsp/jahia/configuration_wizard/adv_settings.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/configuration_wizard/adv_settings.jsp.diff?r1=1.5&r2=1.6&f=h
1.5 +1 -1
jahia/core/src/webapp/jsp/jahia/configuration_wizard/congratulations.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/configuration_wizard/congratulations.jsp.diff?r1=1.4&r2=1.5&f=h
1.4 +2 -1
jahia/core/src/webapp/jsp/jahia/configuration_wizard/css/styles.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/configuration_wizard/css/styles.css.diff?r1=1.3&r2=1.4&f=h
1.3 +1 -1
jahia/core/src/webapp/jsp/jahia/configuration_wizard/error_configured.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/configuration_wizard/error_configured.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -1
jahia/core/src/webapp/jsp/jahia/configuration_wizard/error_save.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/configuration_wizard/error_save.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -1
jahia/core/src/webapp/jsp/jahia/configuration_wizard/error_standalone.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/configuration_wizard/error_standalone.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -1
jahia/core/src/webapp/jsp/jahia/configuration_wizard/mail.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/configuration_wizard/mail.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -1
jahia/core/src/webapp/jsp/jahia/configuration_wizard/root.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/configuration_wizard/root.jsp.diff?r1=1.2&r2=1.3&f=h
1.4 +1 -1
jahia/core/src/webapp/jsp/jahia/configuration_wizard/server.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/configuration_wizard/server.jsp.diff?r1=1.3&r2=1.4&f=h
1.3 +1 -1
jahia/core/src/webapp/jsp/jahia/configuration_wizard/site.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/configuration_wizard/site.jsp.diff?r1=1.2&r2=1.3&f=h
1.3 +1 -1
jahia/core/src/webapp/jsp/jahia/configuration_wizard/templates.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/configuration_wizard/templates.jsp.diff?r1=1.2&r2=1.3&f=h
1.4 +1 -1
jahia/core/src/webapp/jsp/jahia/configuration_wizard/values.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/configuration_wizard/values.jsp.diff?r1=1.3&r2=1.4&f=h
1.12 +40 -3 jahia/core/src/webapp/jsp/jahia/css/colorsAndStyles.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/colorsAndStyles.css.diff?r1=1.11&r2=1.12&f=h
1.1 +20 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/check.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/check.gif?rev=1.1&content-type=text/plain
1.1 +15 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/checks.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/checks.gif?rev=1.1&content-type=text/plain
1.1 +11 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/earth_preferences.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/earth_preferences.gif?rev=1.1&content-type=text/plain
1.1 +18 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/error.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/error.gif?rev=1.1&content-type=text/plain
1.1 +10 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/mail_server.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/mail_server.gif?rev=1.1&content-type=text/plain
1.1 +12 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/server.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/server.gif?rev=1.1&content-type=text/plain
1.1 +14 -0
jahia/core/src/webapp/jsp/jahia/css/images/icones/server_preferences.gif (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/css/images/icones/server_preferences.gif?rev=1.1&content-type=text/plain
Index: adv_settings.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/configuration_wizard/adv_settings.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- adv_settings.jsp 5 Oct 2005 13:49:13 -0000 1.5
+++ adv_settings.jsp 3 Nov 2005 11:03:56 -0000 1.6
@@ -9,7 +9,7 @@
%>
<div id="pagebody">
- <h3><jahia:message key="org.jahia.advancedSettings.label"/></h3>
+ <h3 class="serversettings"><jahia:message
key="org.jahia.advancedSettings.label"/></h3>
<table summary="<jahia:message key="org.jahia.databaseSettings.label"
/>">
<caption><jahia:message
key="org.jahia.databaseSettings.label"/>: </caption>
Index: congratulations.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/configuration_wizard/congratulations.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- congratulations.jsp 3 Nov 2005 09:26:38 -0000 1.4
+++ congratulations.jsp 3 Nov 2005 11:03:56 -0000 1.5
@@ -9,7 +9,7 @@
%>
<div id="pagebody">
- <h3>
+ <h3 class="ok">
<jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.congratulations.congratulationsItWork.label"/>
!
</h3>
Index: error_configured.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/configuration_wizard/error_configured.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- error_configured.jsp 30 Aug 2005 14:39:16 -0000 1.2
+++ error_configured.jsp 3 Nov 2005 11:03:56 -0000 1.3
@@ -3,7 +3,7 @@
<%@ taglib uri="JahiaLib" prefix="jahia" %>
<div id="pagebody">
- <h3><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.error.label"/></h3>
+ <h3 class="error"><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.error.label"/></h3>
<h5>
<jahia:message
Index: error_save.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/configuration_wizard/error_save.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- error_save.jsp 30 Aug 2005 14:39:16 -0000 1.2
+++ error_save.jsp 3 Nov 2005 11:03:56 -0000 1.3
@@ -4,7 +4,7 @@
<jsp:useBean id="errormsg" class="java.lang.String" scope="request"/>
<div id="pagebody">
- <h3><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.errorsave.jahiaGeneratesSomeErrors.label"/></h3>
+ <h3 class="error"><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.errorsave.jahiaGeneratesSomeErrors.label"/></h3>
<p class="error"><%=errormsg%></p>
Index: error_standalone.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/configuration_wizard/error_standalone.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- error_standalone.jsp 30 Aug 2005 14:39:16 -0000 1.2
+++ error_standalone.jsp 3 Nov 2005 11:03:56 -0000 1.3
@@ -3,7 +3,7 @@
<%@ taglib uri="JahiaLib" prefix="jahia" %>
<div id="pagebody">
- <h3>
+ <h3 class="error">
<jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.errorstandalone.jahiaCannotRunStandalone.label"/>
</h3>
Index: mail.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/configuration_wizard/mail.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mail.jsp 30 Aug 2005 14:39:16 -0000 1.2
+++ mail.jsp 3 Nov 2005 11:03:56 -0000 1.3
@@ -4,7 +4,7 @@
<jsp:useBean id="input" class="java.lang.String" scope="request"/>
<div id="pagebody">
- <h3><jahia:message key="org.jahia.mailSettings.label"/></h3>
+ <h3 class="mail"><jahia:message key="org.jahia.mailSettings.label"/></h3>
<p>
<jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.mail.theSettingsAreOptionnal.label"/>.<br/>
Index: root.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/configuration_wizard/root.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- root.jsp 30 Aug 2005 14:39:16 -0000 1.2
+++ root.jsp 3 Nov 2005 11:03:56 -0000 1.3
@@ -4,7 +4,7 @@
<jsp:useBean id="input" class="java.lang.String" scope="request"/>
<div id="pagebody">
- <h3><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.superUserAdministratorSettings.label"/></h3>
+ <h3 class="admin"><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.superUserAdministratorSettings.label"/></h3>
<table
summary="org.jahia.bin.JahiaConfigurationWizard.superUserAdministratorSettings.label">
<caption></caption>
<tr>
Index: server.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/configuration_wizard/server.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- server.jsp 30 Aug 2005 14:39:16 -0000 1.3
+++ server.jsp 3 Nov 2005 11:03:56 -0000 1.4
@@ -4,7 +4,7 @@
<jsp:useBean id="input" class="java.lang.String" scope="request"/>
<div id="pagebody">
- <h3><jahia:message key="org.jahia.serverSettings.label"/></h3>
+ <h3 class="server"><jahia:message
key="org.jahia.serverSettings.label"/></h3>
<table summary="<jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.server.basicSettings.label"/>">
<caption><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.server.basicSettings.label"/>:</caption>
Index: site.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/configuration_wizard/site.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- site.jsp 1 Sep 2005 10:12:18 -0000 1.2
+++ site.jsp 3 Nov 2005 11:03:56 -0000 1.3
@@ -8,7 +8,7 @@
<jsp:useBean id="selectedLocale" class="java.lang.String" scope="request"/>
<div id="pagebody">
- <h3><jahia:message key="org.jahia.defaultSiteSettings.label"/></h3>
+ <h3 class="site"><jahia:message
key="org.jahia.defaultSiteSettings.label"/></h3>
<table summary="<jahia:adminResourceBundle
resourceName="org.jahia.admin.site.ManageSites.siteProperties.label"/>">
<caption>
<jahia:adminResourceBundle
resourceName="org.jahia.admin.site.ManageSites.siteProperties.label"/>
Index: templates.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/configuration_wizard/templates.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- templates.jsp 30 Aug 2005 14:39:16 -0000 1.2
+++ templates.jsp 3 Nov 2005 11:03:56 -0000 1.3
@@ -11,7 +11,7 @@
%>
<div id="pagebody">
- <h3><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.chooseATemplatesPackage.label"/></h3>
+ <h3 class="template"><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.chooseATemplatesPackage.label"/></h3>
<h5><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.templates.prePackagedTemplates.label"/>:</h5>
<jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.templates.chooseTemplateStyle.label"/>.
Index: values.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/configuration_wizard/values.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- values.jsp 4 Oct 2005 12:05:39 -0000 1.3
+++ values.jsp 3 Nov 2005 11:03:56 -0000 1.4
@@ -21,7 +21,7 @@
%>
<div id="pagebody">
-<h3><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.confirmYourValues.label"/></h3>
+<h3 class="values"><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.confirmYourValues.label"/></h3>
<table summary="<jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.values.superUserSettings.label"/>">
<caption><jahia:message
key="org.jahia.bin.JahiaConfigurationWizard.values.superUserSettings.label"/>:</caption>
Index: styles.css
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/configuration_wizard/css/styles.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- styles.css 5 Sep 2005 09:09:18 -0000 1.3
+++ styles.css 3 Nov 2005 11:03:57 -0000 1.4
@@ -164,7 +164,8 @@
}
h3 {
- padding-bottom: 12px;
+ padding-top: 16px;
+ height: 48px;
}
h1, h2, h3 {
Index: colorsAndStyles.css
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/css/colorsAndStyles.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- colorsAndStyles.css 13 Oct 2005 12:22:58 -0000 1.11
+++ colorsAndStyles.css 3 Nov 2005 11:03:57 -0000 1.12
@@ -268,9 +268,46 @@
}
.template {
- background: url( "images/icones/text_code_java.gif" ) no-repeat left
top;
+ background: url( "images/icones/text_code_java.gif" ) no-repeat left
top;
padding-left: 60px;
}
-img {
- behavior: url("/jahia/jsp/jahia/css/pngbehavior.htc");
+
+.admin {
+ background: url( "../engines/images/icons/admin/businessman2_on.gif" )
no-repeat left top;
+ padding-left: 60px;
+}
+
+.ok {
+ background: url( "images/icones/check.gif" ) no-repeat left top;
+ padding-left: 60px;
+}
+
+.error {
+ background: url( "images/icones/error.gif" ) no-repeat left top;
+ padding-left: 60px;
+}
+
+.mail {
+ background: url( "images/icones/mail_server.gif" ) no-repeat left top;
+ padding-left: 60px;
}
+
+.server {
+ background: url( "images/icones/server.gif" ) no-repeat left top;
+ padding-left: 60px;
+}
+
+.serversettings {
+ background: url( "images/icones/server_preferences.gif" ) no-repeat left
top;
+ padding-left: 60px;
+}
+
+.site {
+ background: url( "images/icones/earth_preferences.gif" ) no-repeat left
top;
+ padding-left: 60px;
+}
+
+.values {
+ background: url( "images/icones/checks.gif" ) no-repeat left top;
+ padding-left: 60px;
+}
\ No newline at end of file
Index: check.gif
===================================================================
<<Binary file>>
Index: checks.gif
===================================================================
<<Binary file>>
Index: earth_preferences.gif
===================================================================
<<Binary file>>
Index: error.gif
===================================================================
<<Binary file>>
Index: mail_server.gif
===================================================================
<<Binary file>>
Index: server.gif
===================================================================
<<Binary file>>
Index: server_preferences.gif
===================================================================
<<Binary file>>
