mromy 2005/04/18 11:47:31 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/views/html/startup howtoinstall.html readme.html
Log:
- updated readme and install
Revision Changes Path
1.2.2.5 +8 -3 jahia/src/views/html/startup/howtoinstall.html
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/html/startup/howtoinstall.html.diff?r1=1.2.2.4&r2=1.2.2.5&f=h
1.68.2.13 +9 -43 jahia/src/views/html/startup/readme.html
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/html/startup/readme.html.diff?r1=1.68.2.12&r2=1.68.2.13&f=h
Index: howtoinstall.html
===================================================================
RCS file: /cvs/jahia/src/views/html/startup/Attic/howtoinstall.html,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- howtoinstall.html 15 Apr 2005 14:25:51 -0000 1.2.2.4
+++ howtoinstall.html 18 Apr 2005 09:47:30 -0000 1.2.2.5
@@ -110,7 +110,9 @@
pading: 0 10px 0 10px;
width: 540px;
}
-
+div.maincontent div.indented {
+ margin-left: 40px;
+}
h1 {
color: #666666;
font-family: Arial, Helvetica, sans-serif;
@@ -172,9 +174,11 @@
will not work, you will need to enter manually one of the URLs
mentionned below.
</p>
+ <br/>
<p>
To add the JAVA_HOME environment variable, proceed to the
following:</b>
- </p><br/>
+ </p>
+ <div class="indented">
<p><strong>Windows</strong></p>
<p>
i) Open the Control Panel, then open the System option. Then,
depending on your system :
@@ -201,6 +205,7 @@
</ul>
You will also need to install X Window, as some Jahia interfaces
use some SWING components, which require X Window installed to work.
It is not needed that X Window is started on the server, it only
needs to be installed on disk. <br/><br/><br/>
+ </div>
You can now start Jahia by running jahia.bat from the menu
(Windows) or jahia.sh (Linux).<br/>
Once started, the following URLs allow you to :</br>
<ul>
@@ -211,7 +216,7 @@
</ul>
Please note that when leaving the Administration panel, the URL
generated for the "Leave administration" button can be incorrect,
for example if you access Jahia remotely (= not with localhost) and
if you have not setup a DNS entry corresponding to the site name of
- your virtual site. In such case the URL generated for the "Leave
administration" button will be something like
+ your virtual site. In such a case the URL generated for the "Leave
administration" button will be something like
"http://localhost:8080/jahia/Jahia"; (which of course will not work
remotely). Then please replace manually "localhost" by
the adress (FQDN or IP) you used to access Jahia in the first
place.<br/><br/>
</p>
Index: readme.html
===================================================================
RCS file: /cvs/jahia/src/views/html/startup/Attic/readme.html,v
retrieving revision 1.68.2.12
retrieving revision 1.68.2.13
diff -u -r1.68.2.12 -r1.68.2.13
--- readme.html 15 Apr 2005 14:25:51 -0000 1.68.2.12
+++ readme.html 18 Apr 2005 09:47:30 -0000 1.68.2.13
@@ -177,6 +177,7 @@
<br/>
<h2><b>Table of content:</b></h2>
- <a href="#1">Status</a><br/>
+ - <a href="#4">New taglibs documentation</a><br/>
- <a href="#2">New Features in 4.0.6</a><br/>
- <a href="#3">Adding custom user properties</a><br/>
- <a href="#7">Installation tips</a><br/>
@@ -197,6 +198,13 @@
<br/>
<br/>
<br/>
+ <h2><b><a name="4" id="4"></a>New taglibs documentation</b></h2>
+ A new Jahia taglibs documentation with many example codes is
available and can
+ be found here : <a
href="http://www.jahia.org/jahia/webdav/site/jahia_org/shared/documentation/template";>
+
http://www.jahia.org/jahia/webdav/site/jahia_org/shared/documentation/template</a>.
+ <br/>
+ <br/>
+ <br/>
<h2><b>Most important bug fixes<a name="2" id="2"></a> in Jahia
4.0.6</b></h2>
<ul>
<li><b>Dynamic LDAP Group / Better support for Active Directory
Server</b><br/>
@@ -241,49 +249,7 @@
<br/>
<br/>
<br/>
- <h2><b><a name="3" id="3"></a>Adding custom user properties </b></h2>
- Since Jahia 4.0.6, you can easily define your own custom user
properties, either for users stored in
- Jahia database or in a LDAP directory. In order to add a property,
the following modifications
- should be done :<br/><br/>
- in
<strong>jsp/jahia/administration/user_management/user_create.jsp</strong><br/><br/>
- add the following lines just below the <!-- You can add your custom
user properties here --> comment :<br/><br/>
- <tr><br/>
- <td align="right" nowrap><br/>
- <jahia:adminResourceBundle
resourceName="org.jahia.admin.MYCUSTOM_PROPERTY.label"/> <br/>
- </td><br/>
- <td><br/>
- <input class="input" type="text"
name='<%=ManageUsers.USER_PROPERTY_PREFIX+"MYCUSTOM_PROPERTY"%>'<br/>
- size="40" maxlength="255"
value='<%=getUserProp(userProperties,"MYCUSTOM_PROPERTY")%>'><br/>
- </td><br/>
- </tr><br/><br/>
- (of course you also have to add the appropriate resource bundle key
in WEB-INF/classes/JahiaAdministration.properties)<br/>
- <br/>
- in
<strong>jsp/jahia/administration/user_management/user_edit.jsp</strong><br/>
- <br/>
- add the following lines just below the <!-- You can add your
custom user properties here --> comment :<br/><br/>
- <tr><br/>
- <td align="right" nowrap><br/>
- <jahia:adminResourceBundle
resourceName="org.jahia.admin.MYCUSTOM_PROPERTY.label"/> <br/>
- </td><br/>
- <td><br/>
- <input class="input" type="text"
size="40" maxlength="255"<br/>
- <% if
(isPropReadOnly(userProps, "MYCUSTOM_PROPERTY")) {
%>disabled="true"<%}%><br/>
-
name='<%=ManageUsers.USER_PROPERTY_PREFIX+"MYCUSTOM_PROPERTY"%>'<br/>
-
value='<%=getUserProp(userProps,
"MYCUSTOM_PROPERTY")%>' /><br/>
- </td><br/>
- </tr><br/><br/>
- (same remark about resource bundle entry, but it is the same as for
the user_create.jsp)<br/>
- <br/>
- in your templates/<strong>mysettings.jsp</strong> :<br/>
- <br/>
- <tr><br/>
- <td><jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="mySettingsMYCUSTOM_PROPERTY"/> :</td><br/>
- <td><input type="text" <% if
(isPropReadOnly(engineMap, "MYCUSTOM_PROPERTY")) {
%>disabled="true"<%}%>
name='<%=MySettingsEngine.USER_PROPERTY_PREFIX+"MYCUSTOM_PROPERTY"%>'
value='<%=getUserProp(engineMap, "MYCUSTOM_PROPERTY")%>'
/></td><br/>
- </tr><br/><br/>
- (this time the key must be in the template's resource bundle)<br/>
- <br/>
- <br/>
- <br/>
+
<h2><b><a name="7" id="7"></a>Installation tips </b></h2>
<ul>
<li><b>Make sure you don't use any white spaces in the path name
